@@ -, +, @@ --- acqui/orderreceive.pl | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) --- a/acqui/orderreceive.pl +++ a/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} } } --