diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index de6581afe8..0e0793be3c 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -270,22 +270,12 @@ if ($op eq ""){ $orderinfo{tax_rate} = $bookseller->tax_rate; my $c = $c_discount ? $c_discount : $bookseller->discount / 100; $orderinfo{discount} = $c; - if ( $bookseller->listincgst ) { - if ( $c_discount ) { - $orderinfo{ecost} = $price; - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); - } else { - $orderinfo{ecost} = $price * ( 1 - $c ); - $orderinfo{rrp} = $price; - } + if ( $c_discount ) { + $orderinfo{ecost} = $price; + $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); } else { - if ( $c_discount ) { - $orderinfo{ecost} = $price / ( 1 + $orderinfo{tax_rate} ); - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); - } else { - $orderinfo{rrp} = $price / ( 1 + $orderinfo{tax_rate} ); - $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c ); - } + $orderinfo{ecost} = $price * ( 1 - $c ); + $orderinfo{rrp} = $price; } $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate; $orderinfo{unitprice} = $orderinfo{ecost}; @@ -340,22 +330,12 @@ if ($op eq ""){ $orderinfo{tax_rate} = $bookseller->tax_rate; my $c = $c_discount ? $c_discount : $bookseller->discount / 100; $orderinfo{discount} = $c; - if ( $bookseller->listincgst ) { - if ( $c_discount ) { - $orderinfo{ecost} = $price; - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); - } else { - $orderinfo{ecost} = $price * ( 1 - $c ); - $orderinfo{rrp} = $price; - } + if ( $c_discount ) { + $orderinfo{ecost} = $price; + $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); } else { - if ( $c_discount ) { - $orderinfo{ecost} = $price / ( 1 + $orderinfo{tax_rate} ); - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c ); - } else { - $orderinfo{rrp} = $price / ( 1 + $orderinfo{tax_rate} ); - $orderinfo{ecost} = $orderinfo{rrp} * ( 1 - $c ); - } + $orderinfo{ecost} = $price * ( 1 - $c ); + $orderinfo{rrp} = $price; } $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate; $orderinfo{unitprice} = $orderinfo{ecost};