X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Fnewordersuggestion.pl;h=a0e88e9232629389477c7c46a6a1be65689721c7;hb=abd72378b7c60354430eff9b7c56328ab4383041;hp=b65e4ea62488fd9063f20a687417920bb74961ba;hpb=0d082204ea3c7d3d51a9bdc6eccc436910cdc455;p=koha.git

diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index b65e4ea624..a0e88e9232 100755
--- a/acqui/newordersuggestion.pl
+++ b/acqui/newordersuggestion.pl
@@ -1,20 +1,22 @@
 #!/usr/bin/perl
 
+# Copyright 2006 Biblibre
+# Parts Copyright 2011 PTFS Europe
+#
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 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
 
@@ -89,18 +91,19 @@ can be equal to
 use strict;
 #use warnings; FIXME - Bug 2505
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;    # get_template_and_user
 use C4::Output;
 use C4::Suggestions;
-use C4::Bookseller qw/ GetBookSellerFromId /;
 use C4::Biblio;
 
+use Koha::Acquisition::Bookseller;
+
 my $input = new CGI;
 
 # getting the CGI params
 my $basketno        = $input->param('basketno');
-my $supplierid      = $input->param('booksellerid');
+my $booksellerid      = $input->param('booksellerid');
 my $author          = $input->param('author');
 my $title           = $input->param('title');
 my $publishercode   = $input->param('publishercode');
@@ -114,10 +117,9 @@ $op = 'else' unless $op;
 my $dbh = C4::Context->dbh;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "acqui/newordersuggestion.tmpl",
+        template_name   => "acqui/newordersuggestion.tt",
         type            => "intranet",
         query           => $input,
-        authnotrequired => 1,
         flagsrequired   => { acquisition => 'order_manage' },
     }
 );
@@ -127,19 +129,21 @@ if ( $op eq 'connectDuplicate' ) {
 }
 
 # getting all suggestions.
-my $suggestions_loop =
-        &SearchSuggestion( 
-                { managedby 	=> $borrowernumber, 
-                author		  	=> $author, 
-                title			=> $title, 
-                publishercode	=> $publishercode,
-                STATUS        => 'ACCEPTED'});
-my $vendor = GetBookSellerFromId($supplierid);
+my $suggestions_loop = SearchSuggestion(
+    {
+        author        => $author,
+        title         => $title,
+        publishercode => $publishercode,
+        STATUS        => 'ACCEPTED'
+    }
+);
+my $vendor = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
 $template->param(
     suggestions_loop        => $suggestions_loop,
     basketno                => $basketno,
-    supplierid              => $supplierid,
+    booksellerid              => $booksellerid,
     name					=> $vendor->{'name'},
+    loggedinuser            => $borrowernumber,
     "op_$op"                => 1,
 );