Merge branch 'bug_9824' into 3.14-master

[koha.git] / acqui / booksellers.pl

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 5a1c248..6db0bad 100755 (executable)
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -75,6 +75,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 #parameters
 my $supplier = $query->param('supplier');
 my $booksellerid = $query->param('booksellerid');
+my $allbaskets= $query->param('allbaskets')||0;
 my @suppliers;
 
 if ($booksellerid) {
@@ -87,7 +88,8 @@ my $supplier_count = @suppliers;
 if ( $supplier_count == 1 ) {
     $template->param(
         supplier_name => $suppliers[0]->{'name'},
-        booksellerid  => $suppliers[0]->{'booksellerid'}
+        booksellerid  => $suppliers[0]->{'id'},
+        basketcount   => $suppliers[0]->{'basketcount'}
     );
 }
 
@@ -105,7 +107,7 @@ my $userbranch = $userenv->{branch};
 my $loop_suppliers = [];
 
 for my $vendor (@suppliers) {
-    my $baskets = GetBasketsInfosByBookseller( $vendor->{id} );
+    my $baskets = GetBasketsInfosByBookseller( $vendor->{id}, $allbaskets );
 
     my $loop_basket = [];
 
@@ -148,7 +150,7 @@ $template->param(
     loop_suppliers => $loop_suppliers,
     supplier       => ( $booksellerid || $supplier ),
     count          => $supplier_count,
-    dateformat     => C4::Context->preference('dateformat'),
 );
+$template->{VARS}->{'allbaskets'} = $allbaskets;
 
 output_html_with_http_headers $query, $cookie, $template->output;