Bug 7831 : Sort budgets for selection in new order

[koha.git] / acqui / newordersuggestion.pl

diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl
index bc42446..f33d012 100755 (executable)
--- a/acqui/newordersuggestion.pl
+++ b/acqui/newordersuggestion.pl
@@ -15,7 +15,6 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 =head1 NAME
 
@@ -88,24 +87,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 +118,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         type            => "intranet",
         query           => $input,
         authnotrequired => 1,
-        flagsrequired   => { acquisition => 1 },
+        flagsrequired   => { acquisition => 'order_manage' },
     }
 );
 
@@ -126,18 +128,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;