From 783eeb323cb2bc50c113192df57f2f8f185b7423 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 27 May 2020 10:38:03 +0000 Subject: [PATCH] Bug 25545: Add adjustments to total tax included Adjustments are not affected by tax, they are meant as a way to alter invoice values after receiving (damaged items, refuneds, extra charges, etc) When adjustments were added the tax included column was missed To test: - Add a basket with at least one order - Close it - Receive shipment - Receive the order - Finish receiving - Add an adjustment of any amount - Verify in the invoice details table: - Total tax exc. is showing including the adjustmnt - Total tax inc. is missing the adjustment - Apply patch - Reload - Total tax exc. is showing including the adjustmnt - Total tax inc. is showing including the adjustment Signed-off-by: Katrin Fischer Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 286a739b5cd906a55b2dc97e6ab1ef9ffb00a6f7) Signed-off-by: Lucas Gass (cherry picked from commit 4be984e5e037b2c9767cb6c085e37ba20b3a8448) Signed-off-by: Aleisha Amohia (cherry picked from commit 7cb30b79d71a663e038fdca32ae60b431b4af9c9) Signed-off-by: Victor Grousset/tuxayo --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 6896839851..c1ed7d4308 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -324,7 +324,7 @@ [% total_quantity | html %] [% total_tax_excluded_shipment + total_adj | $Price %] - [% total_tax_included_shipment | $Price %] + [% total_tax_included_shipment + total_adj | $Price %]   [% total_tax_value | $Price %]   -- 2.39.5