merge fix : recieving

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index 76e2f61..fe67cfc 100755 (executable)
--- 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 15a08e7..685ded3 100755 (executable)
--- 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};