From 2a35ba3972f467d2414f266014f1311e36f5b925 Mon Sep 17 00:00:00 2001 From: Lyon3 Team Date: Tue, 15 Oct 2013 11:06:10 +0200 Subject: [PATCH] Bug 10461 - tax not taken in to account in the acq budget summaries --- acqui/orderreceive.pl | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl index 8fc760b..4011320 100755 --- a/acqui/orderreceive.pl +++ b/acqui/orderreceive.pl @@ -170,19 +170,16 @@ if ( $bookseller->{listincgst} ) { $ecost = $order->{ecost}; $unitprice = $order->{unitprice}; } else { - $rrp = $order->{rrp} / ( 1 + $order->{gstrate} ); - $ecost = $order->{ecost} / ( 1 + $order->{gstrate} ); - $unitprice = $order->{unitprice} / ( 1 + $order->{gstrate} ); + $unitprice = $order->{unitprice} + ({unitprice}*$order->{gstrate} ); } } else { if ( $bookseller->{invoiceincgst} ) { - $rrp = $order->{rrp} * ( 1 + $order->{gstrate} ); - $ecost = $order->{ecost} * ( 1 + $order->{gstrate} ); - $unitprice = $order->{unitprice} * ( 1 + $order->{gstrate} ); + $rrp = $order->{rrp} +({rrp}*$order->{gstrate} ); + $ecost = $order->{ecost} +({ecost}*$order->{gstrate}); } else { - $rrp = $order->{rrp}; - $ecost = $order->{ecost}; - $unitprice = $order->{unitprice}; + $unitprice = $order->{unitprice} + ({unitprice}*$order->{gstrate} ); + $rrp = $order->{rrp} +({rrp}*$order->{gstrate} ); + $ecost = $order->{ecost} +({ecost}*$order->{gstrate} } } -- 1.7.2.5