Minor Fix : IndependentBranchPatron misspelling

[koha.git] / acqui / parcels.pl

diff --git a/acqui/parcels.pl b/acqui/parcels.pl
old mode 100644 (file)
new mode 100755 (executable)
index 61eb5b5..30dc0a6
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -1,7 +1,5 @@
- 
 #!/usr/bin/perl
 
-# $Id$
 
 #script to show display basket of orders
 #written by chris@katipo.co.nz 24/2/2000
@@ -23,15 +21,53 @@
 # 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
+
+=head1 NAME
+
+parcels.pl
+
+=head1 DESCRIPTION
+This script shows all orders/parcels receipt or pending for a given supplier.
+It allows to write an order/parcels as 'received' when he arrives.
+
+=head1 CGI PARAMETERS
+
+=over 4
+
+=item supplierid
+To know the supplier this script has to show orders.
+
+=item orderby
+sort list of order by 'orderby'.
+Orderby can be equals to
+    * datereceived desc (default value)
+    * aqorders.booksellerinvoicenumber
+    * datereceived
+    * aqorders.booksellerinvoicenumber desc
+
+=item filter
+
+=item datefrom
+To filter on date
+
+=item dateto
+To filter on date
+
+=item resultsperpage
+To know how many results have to be display / page.
+
+=back
+
+=cut
+
 use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Database;
-use C4::Date;
-use HTML::Template;
+
+use C4::Dates qw/format_date/;
 use C4::Acquisition;
+use C4::Bookseller;
 
 my $input=new CGI;
 my $supplierid=$input->param('supplierid');
@@ -42,7 +78,6 @@ my $datefrom=$input->param('datefrom');
 my $dateto=$input->param('dateto');
 my $resultsperpage = $input->param('resultsperpage');
 
-my ($count,@booksellers)=bookseller($supplierid);
 
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/parcels.tmpl",
@@ -54,8 +89,10 @@ my ($template, $loggedinuser, $cookie)
 });
 
 
+my $bookseller=GetBookSellerFromId($supplierid);
 $resultsperpage = 20 unless ($resultsperpage);
-my ($count,@results)=getparcels($supplierid, $order, $code,$datefrom,$dateto);
+my @results =GetParcels($supplierid, $order, $code,$datefrom,$dateto);
+my $count = scalar @results;
 
 # multi page display gestion
 $startfrom=0 unless ($startfrom);
@@ -64,8 +101,8 @@ if ($count>$resultsperpage){
     my $displayprev=$startfrom;
     if(($count - ($startfrom+$resultsperpage)) > 0 ) {
         $displaynext = 1;
-}
-    
+    }
+
     my @numbers = ();
     if ($count>$resultsperpage) {
         for (my $i=1; $i<$count/$resultsperpage+1; $i++) {
@@ -76,19 +113,17 @@ if ($count>$resultsperpage){
                     highlight => $highlight ,
 #                   searchdata=> "test",
                     startfrom => ($i-1)*$resultsperpage};
-}
-}
-}
-    
+            }
+        }
+    }
+
     my $from = $startfrom*$resultsperpage+1;
     my $to;
-    
-    if($count < (($startfrom+1)*$resultsperpage))
-{
+    if($count < (($startfrom+1)*$resultsperpage)){
         $to = $count;
-} else {
+    } else {
         $to = (($startfrom+1)*$resultsperpage);
-}
+    }
     $template->param(numbers=>\@numbers, 
                      displaynext=>$displaynext,
                      displayprev=>$displayprev,
@@ -100,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;
@@ -123,11 +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,
-        intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-        intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-        IntranetNav => C4::Context->preference("IntranetNav"),
+        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;