From d4bc66bc74ad9ff9d1f826292d0d6979b1951488 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 24 Oct 2013 12:21:14 +0200 Subject: [PATCH] [PASSED QA] Bug 11128: On cancelling receipt, the order is still listed in the received orders Cause: The list of received orders is built *before* cancelling the receipt! Test plan: 0/ don't apply the patch 1/ create a basket 2/ create an order with 3 items 3/ receive 1 item 4/ cancel the receipt => The order is still listed in the received orders table! 5/ apply the patch 6/ do again steps 1 to 4 => The order is not listed in the received orders table. Signed-off-by: Paola Rossi Signed-off-by: Katrin Fischer Works as described and passes all tests and QA script. --- acqui/parcel.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/acqui/parcel.pl b/acqui/parcel.pl index 028e957..61ec330 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -119,7 +119,7 @@ my ($template, $loggedinuser, $cookie) my $invoiceid = $input->param('invoiceid'); my $invoice; -$invoice = GetInvoiceDetails($invoiceid) if $invoiceid; +$invoice = GetInvoice($invoiceid) if $invoiceid; unless( $invoiceid and $invoice->{invoiceid} ) { $template->param( @@ -140,6 +140,8 @@ if ($op eq 'cancelreceipt') { } } +$invoice = GetInvoiceDetails($invoiceid) if $invoiceid; + my $booksellerid = $invoice->{booksellerid}; my $bookseller = GetBookSellerFromId($booksellerid); my $gst = $bookseller->{gstrate} // C4::Context->preference("gist") // 0; -- 1.7.9.5