From e7aa751ecae2c4d24f572dd908cca871d42eb322 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 12 Jul 2022 18:10:54 +0000 Subject: [PATCH] Bug 14680: Always subtract discoutn form price to calculate estimated cost This patch simply removes a discrepancty where when a discount is provided on the order form we add the discount to the price, and when it comes form the vendor we subtract the discount. Discounts should always descrease the estimated cost To test: 0 - Have a vendor with a discount of 10% specified 1 - Export a record from your Koha 2 - Stage the record for import and match on biblionumber 3 - Add to a basket in acq from the staged file 4 - Select the title, and set order price to $10 and do not fill the discount field 5 - Add the order - note $10 RRP and $9 actual/budgeted cost 6 - Repeat 2&3 7 - Select the tile, set price $10 and discount 50% 8 - Add the order - note $20 RRP and $10 actual/budgeted cost! FAIL 9 - Apply patch, restart all 10 - Repeat 2-7 11 - Add the order, note $10 RRP and $5 actual.budgeted cost --- acqui/addorderiso2709.pl | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index dd90a398fb..9d5911564c 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -276,10 +276,7 @@ if ($op eq ""){ $orderinfo{tax_rate} = $bookseller->tax_rate; my $c = $c_discount ? $c_discount : $bookseller->discount; $orderinfo{discount} = $c; - if ( $c_discount ) { - $orderinfo{ecost} = $price; - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c / 100 ); - } else { + if ( $c ) { $orderinfo{ecost} = $price * ( 1 - $c / 100 ); $orderinfo{rrp} = $price; } @@ -337,10 +334,7 @@ if ($op eq ""){ $orderinfo{tax_rate} = $bookseller->tax_rate; my $c = $c_discount ? $c_discount : $bookseller->discount; $orderinfo{discount} = $c; - if ( $c_discount ) { - $orderinfo{ecost} = $c_price; - $orderinfo{rrp} = $orderinfo{ecost} / ( 1 - $c / 100 ); - } else { + if ( $c ) { $orderinfo{ecost} = $c_price * ( 1 - $c / 100 ); $orderinfo{rrp} = $c_price; } -- 2.30.2