From 90c1fe386e11e3b0bb1bec5333e3e34afd7a9680 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 14 May 2023 11:19:07 +0000 Subject: [PATCH] Bug 33721: Fix display of shipping cost/fund on invoice summary page When viewing an invoice, the elements in the 'Fund' line were out of order: 'Fund:' label, followed by 'Show inactive:' label, then the fund drop-down and then the show inactive checkbox. The order should be: 'Fund:' label, fund drop-down, 'Show inactive:' label, show inactive checkbox. This copies the markup that is used when you click on "Receive shipment". It also changes 'Fund' to 'Shipping fund' to bring the forms even more in line. To recreate: 1. In acquisitions, create an order and close the basket 2. Click 'Receive shipment' and receive the order 3. Click 'Finish receiving' --> The Fund line in invoice.tt is out of order 4. Apply patch 5. Verify the order is now fixed Signed-off-by: Barbara Johnson Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d56b959fea1b2c267e73248e11953f7c7c2e04cf) Signed-off-by: Matt Blenkinsop --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 648f3ff41a..543b5c17ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -7,10 +7,10 @@ [% USE AuthorisedValues %] [% BLOCK fund_dropdown %] - + - + [% END %] -- 2.39.5