From 81bfe6edb5b7ec458274b43519e5b4773f90d4e5 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 5 Sep 2016 11:11:44 +0200 Subject: [PATCH] Bug 13321: Recalculate tax_value for partially received orders Test plan: 1. Create an order with at least 2 items 2. Receive only 1 item 3. Check that the tax value of the received order line is correct on the parcel and invoice pages 4. Check that the tax value of the original order line is correct (on the basket page for example) 5. Cancel the receipt 6. Check that the tax value of the original order line is correct Signed-off-by: Sonia Bouis --- C4/Acquisition.pm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 2a8a85c..355c914 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -1400,10 +1400,18 @@ sub ModReceiveOrder { $order->{ordernumber} ); + # Recalculate tax_value + $dbh->do(q| + UPDATE aqorders + SET tax_value = quantity * ecost_tax_excluded * tax_rate + WHERE ordernumber = ? + |, undef, $order->{ordernumber}); + delete $order->{ordernumber}; $order->{budget_id} = ( $budget_id || $order->{budget_id} ); $order->{quantity} = $quantrec; $order->{quantityreceived} = $quantrec; + $order->{tax_value} = $order->{quantity} * $order->{unitprice_tax_excluded} * $order->{tax_rate}; $order->{datereceived} = $datereceived; $order->{invoiceid} = $invoice->{invoiceid}; $order->{orderstatus} = 'complete'; @@ -1556,6 +1564,14 @@ sub CancelReceipt { " receipt"; return; } + + # Recalculate tax_value + $dbh->do(q| + UPDATE aqorders + SET tax_value = quantity * ecost_tax_excluded * tax_rate + WHERE ordernumber = ? + |, undef, $parent_ordernumber); + _cancel_items_receipt( $ordernumber, $parent_ordernumber ); # Delete order line $query = qq{ -- 2.1.4