From d30e02977f4114e8e3bd71c740719a4b5f2a3570 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 10 Nov 2022 19:24:25 +0000 Subject: [PATCH] Bug 32167: [22.05.x] (bug 14860 follow-up) Populate price fields even if no discount on vendor On bug 14860 an 'else' was removed, assuming the price fields were set before discount, this was incorrect. This patch renames the variable and always set the price, only discounting ecost if a discount, but setting the values even if not To test: 0 - Have a vendor with a discount of 0% specified (no discount) 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 $0 order line 6 - Repeat with another vendor with a 10% discount and confirm that is correct 7 - Apply patch 8 - Repeat 2-4 9 - Add the order and confirm $10 price 10 - Repeat with discounted vendor, confirm prices are set discounted correctly Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Martin Renvoize Signed-off-by: Lucas Gass --- acqui/addorderiso2709.pl | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl index 9d5911564c..8027ffc81a 100755 --- a/acqui/addorderiso2709.pl +++ b/acqui/addorderiso2709.pl @@ -274,12 +274,10 @@ if ($op eq ""){ $price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR"; $price = Koha::Number::Price->new($price)->unformat; $orderinfo{tax_rate} = $bookseller->tax_rate; - my $c = $c_discount ? $c_discount : $bookseller->discount; - $orderinfo{discount} = $c; - if ( $c ) { - $orderinfo{ecost} = $price * ( 1 - $c / 100 ); - $orderinfo{rrp} = $price; - } + my $order_discount = $c_discount ? $c_discount : $bookseller->discount; + $orderinfo{discount} = $order_discount; + $orderinfo{rrp} = $price; + $orderinfo{ecost} = $order_discount ? $price * ( 1 - $order_discount / 100 ) : $price; $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate; $orderinfo{unitprice} = $orderinfo{ecost}; $orderinfo{total} = $orderinfo{ecost} * $infos->{quantity}; @@ -332,12 +330,10 @@ if ($op eq ""){ $c_price =~ s/\./,/ if C4::Context->preference("CurrencyFormat") eq "FR"; $c_price = Koha::Number::Price->new($c_price)->unformat; $orderinfo{tax_rate} = $bookseller->tax_rate; - my $c = $c_discount ? $c_discount : $bookseller->discount; - $orderinfo{discount} = $c; - if ( $c ) { - $orderinfo{ecost} = $c_price * ( 1 - $c / 100 ); - $orderinfo{rrp} = $c_price; - } + my $order_discount = $c_discount ? $c_discount : $bookseller->discount; + $orderinfo{discount} = $order_discount; + $orderinfo{rrp} = $c_price; + $orderinfo{ecost} = $order_discount ? $c_price * ( 1 - $order_discount / 100 ) : $c_price; $orderinfo{listprice} = $orderinfo{rrp} / $active_currency->rate; $orderinfo{unitprice} = $orderinfo{ecost}; $orderinfo{total} = $orderinfo{ecost} * $c_quantity; -- 2.39.5