From d563a0c89ce78d96fa671314adc8113ec8edee15 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 13 Dec 2012 14:57:10 +0100 Subject: [PATCH] Bug 9280: Followup FIX price calculation adding an order from a staged file --- acqui/addorderiso2709.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 1427c2f..47156a0 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -222,12 +222,13 @@ if ($op eq ""){ my $basket = GetBasket( $orderinfo{basketno} ); my $bookseller = GetBookSellerFromId( $basket->{booksellerid} ); $orderinfo{gstrate} = $bookseller->{gstrate}; + my $discount = $bookseller->{discount} / 100; if ( $bookseller->{listincgst} ) { $orderinfo{rrp} = $price; - $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $bookseller->{discount} ); + $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $discount ); } else { $orderinfo{rrp} = $price / ( 1 + $orderinfo{gstrate} ); - $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $bookseller->{discount} ); + $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $discount ); } $orderinfo{listprice} = $orderinfo{rrp}; $orderinfo{unitprice} = $orderinfo{ecost}; -- 1.7.10.4