From a1755b31a17c7f59d24ee0d299f1221f844a89d4 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 29 Aug 2019 14:51:16 +0000 Subject: [PATCH] Bug 23522: Show actual price on in baskets To test: 1 - Create a new basket in acq, mark it as 'standing' 2 - Add an item, leave the RRP and Vendor price as 0 3 - Receive shipments for the vendor 4 - Select the title from this basket 5 - On receipt enter an actual cost 6 - Finsih receiving 7 - Go to the basket 8 - Note the total for the order and the basket are 0, keep this browser tab open 9 - Open a new browser tab and create a new non standing basket 10 - Add to basket, again with no RRP or vendor price 11 - Close the basket, receive the item 12 - Enter an actual cost on receipt 13 - Return to view the basket 14 - Total and order are $0 15 - Apply patch 16 - Refresh the basket in both tabs 17 - You now see the actual price for the orders Signed-off-by: Rhonda Kuiper Signed-off-by: Bouzid Fergani Signed-off-by: Martin Renvoize --- acqui/basket.pl | 7 +++++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index e9bf7cd440..4fa1931561 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -459,8 +459,11 @@ sub get_order_infos { $line{basketno} = $basketno; $line{budget_name} = $budget->{budget_name}; - $line{total_tax_included} = get_rounded_price($line{ecost_tax_included}) * $line{quantity}; - $line{total_tax_excluded} = get_rounded_price($line{ecost_tax_excluded}) * $line{quantity}; + # If we have an actual cost tht should be the total, otherwise use the ecost + my $cost_tax_included = $line{unitprice_tax_included} || $line{ecost_tax_included}; + my $cost_tax_excluded = $line{unitprice_tax_excluded} || $line{ecost_tax_excluded}; + $line{total_tax_included} = get_rounded_price($cost_tax_included) * $line{quantity}; + $line{total_tax_excluded} = get_rounded_price($cost_tax_excluded) * $line{quantity}; $line{tax_value} = $line{tax_value_on_ordering}; $line{tax_rate} = $line{tax_rate_on_ordering}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index ad70418b80..8764658ead 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -395,8 +395,10 @@ No. Order RRP tax exc. + Actual cost tax exc. ecost tax exc. RRP tax inc. + Actual cost tax inc. ecost tax inc. Replacement price Qty. @@ -424,6 +426,8 @@       +   +   [% foot_loo.quantity | html %] [% foot_loo.total_tax_excluded | $Price %] [% foot_loo.total_tax_included | $Price %] @@ -447,6 +451,8 @@       +   +   [% total_quantity | html %] [% total_tax_excluded | $Price %] [% total_tax_included | $Price %] @@ -519,8 +525,10 @@ [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %] [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %] [% books_loo.rrp_tax_excluded | $Price %] + [% books_loo.unitprice_tax_excluded | $Price %] [% books_loo.ecost_tax_excluded | $Price %] [% books_loo.rrp_tax_included | $Price %] + [% books_loo.unitprice_tax_included | $Price %] [% books_loo.ecost_tax_included | $Price %] [% books_loo.replacementprice | $Price %] [% books_loo.quantity | html %] -- 2.20.1