bugfixes for acquisition module

[koha_gimpoz] / acqui / parcel.pl

diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 27def76..1d0ee1f 100644 (file)
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -59,11 +59,10 @@ use C4::Auth;
 use C4::Acquisition;
 use C4::Bookseller;
 use C4::Biblio;
-use C4::Output;
 use CGI;
-use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
+use C4::Output;
+use C4::Date;
+
 use strict;
 
 my $input=new CGI;
@@ -71,10 +70,10 @@ my $supplierid=$input->param('supplierid');
 my @booksellers=GetBookSeller($supplierid);
 my $count = scalar @booksellers;
 
-my $invoice=$input->param('code') || '';
+my $invoice=$input->param('invoice') || '';
 my $freight=$input->param('freight');
 my $gst=$input->param('gst');
-my $date=$input->param('datereceived');
+my $datereceived=format_date_in_iso($input->param('datereceived')) || format_date(join "-",Date::Calc::Today());
 my $code=$input->param('code');
 
 my ($template, $loggedinuser, $cookie)
@@ -85,8 +84,7 @@ my ($template, $loggedinuser, $cookie)
                  flagsrequired => {acquisition => 1},
                  debug => 1,
 });
-
-my @parcelitems=GetParcel($supplierid,$invoice,$date);
+my @parcelitems=GetParcel($supplierid,$invoice,$datereceived);
 my $countlines = scalar @parcelitems;
 
 my $totalprice=0;
@@ -103,22 +101,13 @@ for (my $i=0;$i<$countlines;$i++){
     if ($toggle==0){
         $line{color}='#EEEEEE';
         $toggle=1;
-} else {
-        $line{color}='white';
-        $toggle=0;
-}
-    $line{basketno} = $parcelitems[$i]->{'basketno'};
-    $line{isbn} = $parcelitems[$i]->{'isbn'};
-    $line{ordernumber} = $parcelitems[$i]->{'ordernumber'};
-    $line{biblionumber} = $parcelitems[$i]->{'biblionumber'};
+    } else {
+            $line{color}='white';
+            $toggle=0;
+    }
+    %line = %{$parcelitems[$i]};
     $line{invoice} = $invoice;
     $line{gst} = $gst;
-    $line{title} = $parcelitems[$i]->{'title'};
-    $line{author} = $parcelitems[$i]->{'author'};
-    $line{unitprice} = $parcelitems[$i]->{'unitprice'};
-    $line{ecost} = $parcelitems[$i]->{'ecost'};
-    $line{quantityrecieved} = $parcelitems[$i]->{'quantityreceived'};
-    $line{quantity} = $parcelitems[$i]->{'quantity'};
     $line{total} = $total;
     $line{supplierid} = $supplierid;
     push @loop_received, \%line;
@@ -127,8 +116,8 @@ for (my $i=0;$i<$countlines;$i++){
     $totalquantity+=$parcelitems[$i]->{'quantityreceived'};
     $tototal+=$total;
 }
-my @pendingorders = GetAllOrders($supplierid);
-my $countpendings = scalar @pendingorders;
+my $pendingorders = GetPendingOrders($supplierid);
+my $countpendings = scalar @$pendingorders;
 
 my @loop_orders = ();
 for (my $i=0;$i<$countpendings;$i++){
@@ -136,22 +125,15 @@ for (my $i=0;$i<$countpendings;$i++){
     if ($toggle==0){
         $line{color}='#EEEEEE';
         $toggle=1;
-} else {
-        $line{color}='white';
-        $toggle=0;
-}
-    $line{basketno} = $pendingorders[$i]->{'basketno'};
-    $line{isbn} = $pendingorders[$i]->{'isbn'};
-    $line{ordernumber} = $pendingorders[$i]->{'ordernumber'};
-    $line{biblionumber} = $pendingorders[$i]->{'biblionumber'};
+    } else {
+            $line{color}='white';
+            $toggle=0;
+    }
+    %line = %{$pendingorders->[$i]};
+    $line{ecost} = sprintf("%.2f",$line{ecost});
+    $line{unitprice} = sprintf("%.2f",$line{unitprice});
     $line{invoice} = $invoice;
     $line{gst} = $gst;
-    $line{title} = $pendingorders[$i]->{'title'};
-    $line{author} = $pendingorders[$i]->{'author'};
-    $line{unitprice} = $pendingorders[$i]->{'unitprice'};
-    $line{ecost} = $pendingorders[$i]->{'ecost'};
-    $line{quantityrecieved} = $pendingorders[$i]->{'quantityreceived'};
-    $line{quantity} = $pendingorders[$i]->{'quantity'};
     $line{total} = $total;
     $line{supplierid} = $supplierid;
     push @loop_orders, \%line;
@@ -161,7 +143,8 @@ $totalfreight=$freight;
 $tototal=$tototal+$freight;
 
 $template->param(invoice => $invoice,
-                        date => $date,
+                                               datereceived => $datereceived,
+                                               formatteddatereceived => format_date($datereceived),
                         name => $booksellers[0]->{'name'},
                         supplierid => $supplierid,
                         gst => $gst,