From 72ef65edbe3413027fb877e37929e98cf7fd26fe Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 4 Aug 2023 14:29:11 +0000 Subject: [PATCH] Bug 34452: Restore fund label and 'Update adjustments' button This patch fixed 2 small and recent regressions: * The "Update adjustments" button used to always display. It's required to save a new first adjustment, but also to save changes to existing adjustments edited inline. It now would only display after "Add adjustments" was clicked. We retore to display it always. (bug 32746) * We have several "Fund" pull downs on this page, but they are for different things and require different labelling. "Fund" was changed to "Shipping fund" which matches at the top, but doesn't work for the adjustments table and single adjustment form. Now we use "Shipping fund" "Fund" and no label in the table as the table header covers it there. (bug 33721) To test. * Add a vendor * Receive shipment * Add invoice and save * Click on "Finish receiving" * Verify the button "Update adjustments" appears after clicking "Add new adjustment" * Verify the button is gone after you clicked it and the table shows * Change something in the table - no button to save change :( * Apply patch * Repeat steps, button "Update adjustments" should not always be visible. Signed-off-by: Sam Lau Signed-off-by: Michaela Sieber Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Tomas Cohen Arazi --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 20130ae0a7..e1044e37be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -7,7 +7,6 @@ [% USE AuthorisedValues %] [% BLOCK fund_dropdown %] - @@ -97,6 +96,7 @@ [% END %]
  • + [% PROCESS fund_dropdown form_id => 'shipment_budget_id' form_name => 'shipment_budget_id' selected => shipment_budget_id %]
  • @@ -272,6 +272,7 @@
  • + [% PROCESS fund_dropdown form_id => "budget_id_new" form_name => 'budget_id' selected => "" %]
  • @@ -284,7 +285,7 @@ [% END #/UNLESS readonly %] [% UNLESS readonly %] -