Remove Stopwords bug fixing

[koha.git] / acqui / parcels.pl

diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 14e4013..30dc0a6 100755 (executable)
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -65,8 +65,7 @@ use CGI;
 use C4::Auth;
 use C4::Output;
 
-use C4::Date;
-
+use C4::Dates qw/format_date/;
 use C4::Acquisition;
 use C4::Bookseller;
 
@@ -79,8 +78,6 @@ my $datefrom=$input->param('datefrom');
 my $dateto=$input->param('dateto');
 my $resultsperpage = $input->param('resultsperpage');
 
-my @booksellers=GetBookSeller($supplierid);
-my $count = scalar @booksellers;
 
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/parcels.tmpl",
@@ -92,9 +89,10 @@ my ($template, $loggedinuser, $cookie)
 });
 
 
+my $bookseller=GetBookSellerFromId($supplierid);
 $resultsperpage = 20 unless ($resultsperpage);
 my @results =GetParcels($supplierid, $order, $code,$datefrom,$dateto);
-$count = scalar @results;
+my $count = scalar @results;
 
 # multi page display gestion
 $startfrom=0 unless ($startfrom);
@@ -137,11 +135,6 @@ my @loopres;
 
 my $hilighted=0;
 for (my $i=$startfrom;$i<=($startfrom+$resultsperpage-1<$count-1?$startfrom+$resultsperpage-1:$count-1);$i++){
-### startfrom: $startfrom
-### resultsperpage: $resultsperpage
-### count: $count
-### code: $results[$i]->{booksellerinvoicenumber}
-### datereceived: $results[$i]->{datereceived}
 
     my %cell;
     $cell{number}=$i+1;
@@ -160,8 +153,11 @@ for (my $i=$startfrom;$i<=($startfrom+$resultsperpage-1<$count-1?$startfrom+$res
 $template->param(searchresults=>\@loopres, count=>$count) if ($count);
 $template->param(orderby=>$order, filter=>$code, datefrom=>$datefrom,dateto=>$dateto, resultsperpage=>$resultsperpage);
 $template->param(
-        name => $booksellers[0]->{'name'},
-        supplierid => $supplierid,
+        name => $bookseller->{'name'},
+        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+               datereceived_today => C4::Dates->new()->output(),
+               supplierid => $supplierid,
+           GST => C4::Context->preference("gist"),
         );
 
 output_html_with_http_headers $input, $cookie, $template->output;