X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Fnewordersuggestion.pl;h=839b4f4bbf7d6cb364f1c8f65cd7d87f3ae4c6cc;hb=7c224d1cb05099749d4046a4dad75ae49ff186cc;hp=e56e52197d84297b5c1d30ad5d789262f17d3e41;hpb=4bf76c2d77cb32dd7147b11334eb17aa959955ba;p=koha.git

diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index e56e52197d..839b4f4bbf 100755
--- a/acqui/newordersuggestion.pl
+++ b/acqui/newordersuggestion.pl
@@ -1,5 +1,8 @@
 #!/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
@@ -11,10 +14,9 @@
 # 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, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 =head1 NAME
 
@@ -87,36 +89,38 @@ can be equal to
 =cut
 
 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;
 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');
 my $op              = $input->param('op');
 my $suggestionid    = $input->param('suggestionid');
 my $duplicateNumber = $input->param('duplicateNumber');
+my $uncertainprice = $input->param('uncertainprice');
 
 $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 => 1 },
+        flagsrequired   => { acquisition => 'order_manage' },
     }
 );
 
@@ -125,15 +129,21 @@ if ( $op eq 'connectDuplicate' ) {
 }
 
 # getting all suggestions.
-my $suggestions_loop =
-  &SearchSuggestion( $borrowernumber, $author, $title, $publishercode,'ACCEPTED',
-    -1 );
-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,
-	name					=> $vendor->{'name'},
+    booksellerid              => $booksellerid,
+    name					=> $vendor->{'name'},
+    loggedinuser            => $borrowernumber,
     "op_$op"                => 1,
 );