X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=acqui%2Fnewordersuggestion.pl;h=efc634bf2c514dd9c439c814b8725612e258912d;hb=568f32606c2c9c247b2b477193a2d6814f738fa6;hp=bc424465c1c1b7519f6de94de66025ba1c03f80a;hpb=2ffd5b7228f4e638583162d483e1dd2febeafe1b;p=koha.git

diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index bc424465c1..efc634bf2c 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,11 +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
-
-# $Id$
+# 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
 
@@ -88,24 +89,27 @@ can be equal to
 =cut
 
 use strict;
-require Exporter;
+#use warnings; FIXME - Bug 2505
+
 use CGI;
 use C4::Auth;    # get_template_and_user
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Suggestions;
+use C4::Bookseller qw/ GetBookSellerFromId /;
 use C4::Biblio;
 
 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;
 
@@ -116,7 +120,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         type            => "intranet",
         query           => $input,
         authnotrequired => 1,
-        flagsrequired   => { acquisition => 1 },
+        flagsrequired   => { acquisition => 'order_manage' },
     }
 );
 
@@ -126,18 +130,19 @@ if ( $op eq 'connectDuplicate' ) {
 
 # getting all suggestions.
 my $suggestions_loop =
-  &SearchSuggestion( $borrowernumber, $author, $title, $publishercode,'ACCEPTED',
-    -1 );
-
+        &SearchSuggestion( 
+                { managedby 	=> $borrowernumber, 
+                author		  	=> $author, 
+                title			=> $title, 
+                publishercode	=> $publishercode,
+                STATUS        => 'ACCEPTED'});
+my $vendor = GetBookSellerFromId($booksellerid);
 $template->param(
     suggestions_loop        => $suggestions_loop,
     basketno                => $basketno,
-    supplierid              => $supplierid,
+    booksellerid              => $booksellerid,
+    name					=> $vendor->{'name'},
     "op_$op"                => 1,
-    intranetcolorstylesheet =>
-      C4::Context->preference("intranetcolorstylesheet"),
-    intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-    IntranetNav        => C4::Context->preference("IntranetNav"),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;