[Koha-cvs] koha/acqui parcels.pl

[Antoine Farnault]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Antoine Farnault <toins>        06/07/31 09:29:46

Modified files:
        acqui          : parcels.pl 

Log message:
        Code cleaned. POD added & some subs renamed/rewrited/added... 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/parcels.pl?cvsroot=koha&r1=1.1&r2=1.2

Patches:
Index: parcels.pl
===================================================================
RCS file: /sources/koha/koha/acqui/parcels.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- parcels.pl  13 Jul 2006 14:24:18 -0000      1.1
+++ parcels.pl  31 Jul 2006 09:29:45 -0000      1.2
@@ -1,7 +1,6 @@
- 
 #!/usr/bin/perl
 
-# $Id: parcels.pl,v 1.1 2006/07/13 14:24:18 toins Exp $
+# $Id: parcels.pl,v 1.2 2006/07/31 09:29:45 toins Exp $
 
 #script to show display basket of orders
 #written by address@hidden 24/2/2000
@@ -23,6 +22,45 @@
 # 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;
@@ -32,6 +70,7 @@
 use C4::Date;
 use HTML::Template;
 use C4::Acquisition;
+use C4::Bookseller;
 
 my $input=new CGI;
 my $supplierid=$input->param('supplierid');
@@ -42,7 +81,8 @@
 my $dateto=$input->param('dateto');
 my $resultsperpage = $input->param('resultsperpage');
 
-my ($count,@booksellers)=bookseller($supplierid);
+my @booksellers=GetBookSeller($supplierid);
+my $count = scalar @booksellers;
 
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/parcels.tmpl",
@@ -55,7 +95,8 @@
 
 
 $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,7 +105,7 @@
     my $displayprev=$startfrom;
     if(($count - ($startfrom+$resultsperpage)) > 0 ) {
         $displaynext = 1;
-}
+    }
     
     my @numbers = ();
     if ($count>$resultsperpage) {
@@ -76,19 +117,17 @@
                     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=>address@hidden, 
                      displaynext=>$displaynext,
                      displayprev=>$displayprev,