@@ -, +, @@ orders the parcel and invoice pages the basket page for example) --- C4/Acquisition.pm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) --- a/C4/Acquisition.pm +++ a/C4/Acquisition.pm @@ -1403,7 +1403,9 @@ sub ModReceiveOrder { # Recalculate tax_value $dbh->do(q| UPDATE aqorders - SET tax_value = quantity * ecost_tax_excluded * tax_rate + SET + tax_value_on_ordering = quantity * ecost_tax_excluded * tax_rate_on_ordering, + tax_value_on_receiving = quantity * unitprice_tax_excluded * tax_rate_on_receiving WHERE ordernumber = ? |, undef, $order->{ordernumber}); @@ -1411,7 +1413,8 @@ sub ModReceiveOrder { $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->{tax_value_on_ordering} = $order->{quantity} * $order->{ecost_tax_excluded} * $order->{tax_rate_on_ordering}; + $order->{tax_value_on_receiving} = $order->{quantity} * $order->{unitprice_tax_excluded} * $order->{tax_rate_on_receiving}; $order->{datereceived} = $datereceived; $order->{invoiceid} = $invoice->{invoiceid}; $order->{orderstatus} = 'complete'; @@ -1571,7 +1574,9 @@ sub CancelReceipt { # Recalculate tax_value $dbh->do(q| UPDATE aqorders - SET tax_value = quantity * ecost_tax_excluded * tax_rate + SET + tax_value_on_ordering = quantity * ecost_tax_excluded * tax_rate_on_ordering, + tax_value_on_receiving = quantity * unitprice_tax_excluded * tax_rate_on_receiving WHERE ordernumber = ? |, undef, $parent_ordernumber); --