From 9308599dee6282b459ed3cf7803e8da83839fa93 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Tue, 9 Jun 2009 17:07:48 +0200 Subject: [PATCH] merge fix : recieving --- acqui/finishreceive.pl | 4 ++++ acqui/parcel.pl | 15 ++++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl index 76e2f61ba0..fe67cfcb3b 100755 --- a/acqui/finishreceive.pl +++ b/acqui/finishreceive.pl @@ -115,3 +115,7 @@ if ($quantityrec > $origquantityrec ) { } } print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived$error_url_str"); +<<<<<<< HEAD:acqui/finishreceive.pl +======= +# >>>>>>> finishreceive:acqui/finishreceive.pl +>>>>>>> 8a2ecbd... merge fix : recieving:acqui/finishreceive.pl diff --git a/acqui/parcel.pl b/acqui/parcel.pl index 15a08e73e8..685ded33f6 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -143,18 +143,11 @@ my $ordergrandtotal; my @loop_orders = (); for (my $i = 0 ; $i < $countpendings ; $i++) { my %line; - if ($toggle==0){ - $line{color}='#EEEEEE'; - $toggle=1; - } else { - $line{color}='white'; - $toggle=0; - } %line = %{$pendingorders->[$i]}; - $line{quantity}+=0; - $line{quantrem} = $line{quantity} - $line{quantityreceived}; - $line{quantityreceived}+=0; - $line{unitprice}+=0; + $line{quantity}+=0; + $line{quantrem} = $line{quantity} - $line{quantityreceived}; + $line{quantityreceived}+=0; + $line{unitprice}+=0; $totalPunitprice += $line{unitprice}; $totalPquantity +=$line{quantity}; $totalPqtyrcvd +=$line{quantityreceived}; -- 2.39.5