Removing unconditionnal warning

[koha.git] / acqui / booksellers.pl

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 91756f1..24677ec 100755 (executable)
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -60,7 +60,7 @@ use CGI;
 
 
 use C4::Acquisition;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Bookseller;
 
 my $query = new CGI;
@@ -77,15 +77,24 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 #parameters
 my $supplier = $query->param('supplier');
+my $id       = $query->param('id') || $query->param('supplierid');
+my @suppliers;
 
-my @suppliers = GetBookSeller($supplier);
+if ($id) {
+       push @suppliers, GetBookSellerFromId($id);
+} else {
+       @suppliers = GetBookSeller($supplier);
+}
 my $count = scalar @suppliers;
-
+if ($count == 1){
+       $template->param( supplier_name => $suppliers[0]->{'name'},
+               id => $suppliers[0]->{'id'}
+       );
+}
 # check if we have to "close" a basket before building page
-my $op     = $query->param('op');
-my $basket = $query->param('basketno');
-if ( $op eq 'close' ) {
-    CloseBasket($basket);
+if ($query->param('op') eq 'close') {
+       my $basket = $query->param('basketno');
+       $basket =~ /^\d+$/ and CloseBasket($basket);
 }
 
 #build result page
@@ -114,7 +123,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
         $inner_line{surname}      = $orders->[$i2]{'firstname'};
         $inner_line{firstname}    = $orders->[$i2]{'surname'};
         $inner_line{creationdate} = format_date( $orders->[$i2]{'creationdate'} );
-        $inner_line{closedate} = format_date( $orders->[$i2]{'closedate'} );
+        $inner_line{closedate}    = format_date( $orders->[$i2]{'closedate'}    );
         push @loop_basket, \%inner_line;
     }
     $line{loop_basket} = \@loop_basket;
@@ -122,7 +131,7 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
 }
 $template->param(
     loop_suppliers          => \@loop_suppliers,
-    supplier                => $supplier,
+    supplier                => ($id || $supplier),
     count                   => $count,
 );