From c6b0b9cf1b46027e44cee0730befa8d8ac40efbd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 22 Nov 2016 15:28:04 +0000 Subject: [PATCH] Bug 17668: Fix typo in parcel.pl - listinct vs listincgst This typo has been introduced by commit eed14b080db8691f371b4c19f1a190b87fcc396a Bug 13001: Refactor VAT and price calculation - parcel page So before the tax rewrite (13321, 13323). It sounded weird to me that testers did not catch the bug on this page. To understand the logic: Conditions are listincgst, invoiceincgst Conditions | Before this patch | If we fix the typo | After this patch 0 0 | excluded | excluded | excluded 0 1 | included | included | included 1 0 | excluded | excluded | excluded 1 1 | included | included | included Test plan: Create 4 vendors with the difference combinations Create a basket, add an order (with a tax) and receive it Confirm that the different values displayed on the parcel page are correct Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall (cherry picked from commit 3e112f3837346b500ce863a248920d3207e27131) Signed-off-by: Katrin Fischer --- acqui/parcel.pl | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/acqui/parcel.pl b/acqui/parcel.pl index 8f2d46f43b..65be105123 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -124,17 +124,15 @@ my $subtotal_for_funds; for my $order ( @orders ) { $order->{'unitprice'} += 0; - if ( $bookseller->{listincgst} and not $bookseller->{invoiceincgst} ) { - $order->{ecost} = $order->{ecost_tax_excluded}; - $order->{unitprice} = $order->{unitprice_tax_excluded}; - } - elsif ( not $bookseller->{listinct} and $bookseller->{invoiceincgst} ) { + if ( $bookseller->{invoiceincgst} ) { $order->{ecost} = $order->{ecost_tax_included}; $order->{unitprice} = $order->{unitprice_tax_included}; - } else { - $order->{ecost} = $order->{ecost_tax_excluded}; + } + else { + $order->{ecost} = $order->{ecost_tax_excluded}; $order->{unitprice} = $order->{unitprice_tax_excluded}; } + $order->{total} = $order->{unitprice} * $order->{quantity}; my %line = %{ $order }; @@ -224,9 +222,7 @@ unless( defined $invoice->{closedate} ) { for (my $i = 0 ; $i < $countpendings ; $i++) { my $order = $pendingorders->[$i]; - if ( $bookseller->{listincgst} and not $bookseller->{invoiceincgst} ) { - $order->{ecost} = $order->{ecost_tax_excluded}; - } elsif ( not $bookseller->{listinct} and $bookseller->{invoiceincgst} ) { + if ( $bookseller->{invoiceincgst} ) { $order->{ecost} = $order->{ecost_tax_included}; } else { $order->{ecost} = $order->{ecost_tax_excluded}; -- 2.39.5