improvements to the language of the installer

[koha_gimpoz] / acqui / finishreceive.pl

diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl
index fe689ed..476fd99 100755 (executable)
--- a/acqui/finishreceive.pl
+++ b/acqui/finishreceive.pl
@@ -31,13 +31,14 @@ use C4::Search;
 my $input=new CGI;
 
 my $user=$input->remote_user;
-my $biblionumber = $input->param('biblio');
-my $bibitemno=$input->param('biblioitemnum');
+my $biblionumber = $input->param('biblionumber');
+my $biblioitemnumber=$input->param('biblioitemnumber');
 my $ordnum=$input->param('ordnum');
 my $quantrec=$input->param('quantityrec');
 my $quantity=$input->param('quantity');
 my $cost=$input->param('cost');
 my $invoiceno=$input->param('invoice');
+my $datereceived=$input->param('datereceived');
 my $replacement=$input->param('rrp');
 my $gst=$input->param('gst');
 my $freight=$input->param('freight');
@@ -49,22 +50,22 @@ my $branch=$input->param('branch');
 # }
 
 if ($quantity != 0) {
-       # save the quantity recieved.
-       receiveorder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$freight,$replacement);
-       # create items if the user has entered barcodes
-       my $barcode=$input->param('barcode');
-       my @barcodes=split(/\,| |\|/,$barcode);
-       my ($error) = newitems({ biblioitemnumber => $bibitemno,
-                                       biblionumber     => $biblionumber,
-                                       replacementprice => $replacement,
-                                       price            => $cost,
-                                       booksellerid     => $supplierid,
-                                       homebranch       => $branch,
-                                       loan             => 0 },
-                               @barcodes);
-       print $input->redirect("/cgi-bin/koha/acqui/receive.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst");
+    # save the quantity recieved.
+    $datereceived = ModReceiveOrder($biblionumber,$ordnum,$quantrec,$user,$cost,$invoiceno,$datereceived,$freight,$replacement);
+    # create items if the user has entered barcodes
+    my $barcode=$input->param('barcode');
+    my @barcodes=split(/\,| |\|/,$barcode);
+    my ($error) = newitems({ biblioitemnumber => $biblioitemnumber,
+                    biblionumber     => $biblionumber,
+                    replacementprice => $replacement,
+                    price            => $cost,
+                    booksellerid     => $supplierid,
+                    homebranch       => $branch,
+                    loan             => 0 },
+                @barcodes);
+    print $input->redirect("/cgi-bin/koha/acqui/parcel.pl?invoice=$invoiceno&supplierid=$supplierid&freight=$freight&gst=$gst&datereceived=$datereceived");
 } else {
-       print $input->header;
-       delorder($biblionumber,$ordnum);
-       print $input->redirect("/acquisitions/");
+    print $input->header;
+    delorder($biblionumber,$ordnum);
+    print $input->redirect("/acquisitions/");
 }