From 5c5afa4ffb0eb86face5692eec7a39bbd7cc3a6d Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 18 Dec 2019 18:10:15 +0100 Subject: [PATCH] Bug 17667: Do not modify quantity of the original standing order when a receipt is cancelled When cancelling a receipt, the quantity of the original order is increased. Test plan: Create a basket, mark is as "standing orders" Create an order receive it cancel the receipt => Without this patch the quantity of the original order is 2 => With this patch applied the quantity it always 1 Signed-off-by: Kelly McElligott Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Joy Nelson (cherry picked from commit 31832c35e3bfe71a58dce9359319cba9a6eaa159) Signed-off-by: Lucas Gass --- C4/Acquisition.pm | 84 ++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index c99e39f414..4158e93cb4 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -1623,48 +1623,50 @@ sub CancelReceipt { } else { # The order line has a parent, increase parent quantity and delete # the order line. - $query = qq{ - SELECT quantity, datereceived - FROM aqorders - WHERE ordernumber = ? - }; - $sth = $dbh->prepare($query); - $sth->execute($parent_ordernumber); - my $parent_order = $sth->fetchrow_hashref; - unless($parent_order) { - warn "Parent order $parent_ordernumber does not exist."; - return; - } - if($parent_order->{'datereceived'}) { - warn "CancelReceipt: parent order is received.". - " Can't cancel receipt."; - return; - } - $query = qq{ - UPDATE aqorders - SET quantity = ?, - orderstatus = 'ordered' - WHERE ordernumber = ? - }; - $sth = $dbh->prepare($query); - my $rv = $sth->execute( - $order->{'quantity'} + $parent_order->{'quantity'}, - $parent_ordernumber - ); - unless($rv) { - warn "Cannot update parent order line, so do not cancel". - " receipt"; - return; - } + unless ( $order_obj->basket->is_standing ) { + $query = qq{ + SELECT quantity, datereceived + FROM aqorders + WHERE ordernumber = ? + }; + $sth = $dbh->prepare($query); + $sth->execute($parent_ordernumber); + my $parent_order = $sth->fetchrow_hashref; + unless($parent_order) { + warn "Parent order $parent_ordernumber does not exist."; + return; + } + if($parent_order->{'datereceived'}) { + warn "CancelReceipt: parent order is received.". + " Can't cancel receipt."; + return; + } + $query = qq{ + UPDATE aqorders + SET quantity = ?, + orderstatus = 'ordered' + WHERE ordernumber = ? + }; + $sth = $dbh->prepare($query); + my $rv = $sth->execute( + $order->{'quantity'} + $parent_order->{'quantity'}, + $parent_ordernumber + ); + unless($rv) { + warn "Cannot update parent order line, so do not cancel". + " receipt"; + return; + } - # Recalculate tax_value - $dbh->do(q| - UPDATE aqorders - SET - tax_value_on_ordering = quantity * | . get_rounding_sql(q|ecost_tax_excluded|) . q| * tax_rate_on_ordering, - tax_value_on_receiving = quantity * | . get_rounding_sql(q|unitprice_tax_excluded|) . q| * tax_rate_on_receiving - WHERE ordernumber = ? - |, undef, $parent_ordernumber); + # Recalculate tax_value + $dbh->do(q| + UPDATE aqorders + SET + tax_value_on_ordering = quantity * | . get_rounding_sql(q|ecost_tax_excluded|) . q| * tax_rate_on_ordering, + tax_value_on_receiving = quantity * | . get_rounding_sql(q|unitprice_tax_excluded|) . q| * tax_rate_on_receiving + WHERE ordernumber = ? + |, undef, $parent_ordernumber); + } _cancel_items_receipt( $order_obj, $parent_ordernumber ); # Delete order line -- 2.39.5