X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Fmodordernotes.pl;h=d0bd672e440059dcb20889e454c442f278b6afe2;hb=31c29fd31f557306233e6a2936148a5bb10b89a1;hp=ffdc9f6c740f0656f436ac965f0daee5472270e9;hpb=6eb021ab0e113e2b6b897c89475f1eadc7a2c15b;p=koha.git

diff --git a/acqui/modordernotes.pl b/acqui/modordernotes.pl
index ffdc9f6c74..d0bd672e44 100755
--- a/acqui/modordernotes.pl
+++ b/acqui/modordernotes.pl
@@ -3,18 +3,18 @@
 # Copyright 2011 BibLibre SARL
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 =head1 NAME
 
@@ -28,15 +28,16 @@ Modify just notes when basket is closed.
 
 use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 use C4::Acquisition;
-use C4::Bookseller qw( GetBookSellerFromId);
+
+use Koha::Acquisition::Booksellers;
 
 my $input = new CGI;
 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
-    template_name   => 'acqui/modordernotes.tmpl',
+    template_name   => 'acqui/modordernotes.tt',
     query           => $input,
     type            => 'intranet',
     authnotrequired => 0,
@@ -47,22 +48,28 @@ my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
 my $op = $input->param('op');
 my $ordernumber = $input->param('ordernumber');
 my $referrer = $input->param('referrer') || $input->referer();
-
+my $type = $input->param('type');
 my $order = GetOrder($ordernumber);
 my $basket = GetBasket($order->{basketno});
-my ($bookseller) = GetBookSellerFromId($basket->{booksellerid});
+my $bookseller = Koha::Acquisition::Booksellers->find( $basket->{booksellerid} );
 
 
 if($op and $op eq 'save') {
     my $ordernotes = $input->param('ordernotes');
-    $order->{'notes'} = $ordernotes;
+    if ($type eq "vendor") {
+        $order->{'order_vendornote'} = $ordernotes;
+    } else {
+        $order->{'order_internalnote'} = $ordernotes;
+    }
     ModOrder($order);
     print $input->redirect($referrer);
     exit;
 } else {
-    $template->param(
-        ordernotes => $order->{'notes'},
-    );
+    if ($type eq "vendor") {
+        $template->param(ordernotes => $order->{'order_vendornote'});
+    } else {
+        $template->param(ordernotes => $order->{'order_internalnote'});
+    }
 }
 
 if($op) {
@@ -72,10 +79,11 @@ if($op) {
 $template->param(
     basketname           => $basket->{'basketname'},
     basketno             => $order->{basketno},
-    booksellerid         => $bookseller->{'id'},
-    booksellername       => $bookseller->{'name'},
+    booksellerid         => $bookseller->id,
+    booksellername       => $bookseller->name,
     ordernumber => $ordernumber,
     referrer => $referrer,
+    type => $type,
 );