From 809360128600b9d50d672e6f9f0265c428925b1d Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Thu, 24 Jun 2021 21:48:48 +1200 Subject: [PATCH] Bug 28627: Fallback to displaying ecost_tax_included, ecost_tax_excluded in orderreceive.pl Test plan: 1. Create a basket and adding items to it. Set the 'Vendor price' to '20', do not add an 'Actual cost' 2. Close the basket 3. Select 'Receive shipment' 4. Set a value for vendor invoice 5. Receive the order you created 6. Observe 'Actual cost' is = 0.00 7. Apply patch 8. Refresh the order receival page, and confirm the 'Actual cost' = 20.00 Sponsored-By: South Taranaki District Council, NZ --- .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 49aecfc219..3e68096b6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -343,9 +343,17 @@
  • [% IF (invoiceincgst) %] - (tax inclusive) + [% IF (order.unitprice_tax_included == 0.00000) %] + (tax inclusive) + [% ELSE %] + (tax inclusive) + [% END %] [% ELSE %] - (tax exclusive) + [% IF (order.unitprice_tax_excluded == 0.00000) %] + (tax exclusive) + [% ELSE %] + (tax exclusive) + [% END %] [% END %]
  • -- 2.11.0