Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

merge fix : recieving

Browse source
This commit is contained in:
Paul Poulain 2009-06-09 17:07:48 +02:00 committed by Henri-Damien LAURENT
parent eba29b259b
commit 9308599dee
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
acqui/finishreceive.pl
View file

@ -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

15
acqui/parcel.pl
View file

@ -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};