MT 1487 : Ability to cancel orders when receiving shipments

[koha_fer] / acqui / finishreceive.pl

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