From 69501e5ce32574c361fde2d6b7f614d8f4f5d6f9 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer@bsz-bw.de>
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 <samalau@gmail.com>
---
 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 %]
-    <label for="[% form_name | html %]">Shipping fund: </label>
     <select id="[% form_id | html %]" name="[% form_name | html %]" class="fund_dropdown" data-selected="[% selected | html %]">
     </select>
     <label for="showallfunds" style="float:none;width:auto;">&nbsp;Show inactive:</label>
@@ -97,6 +96,7 @@
                                 [% END %]
                             </li>
                             <li>
+                                <label for="shipment_budget_id">Shipping fund: </label>
                                 [% PROCESS fund_dropdown form_id => 'shipment_budget_id' form_name => 'shipment_budget_id' selected => shipment_budget_id %]
                             </li>
 
@@ -272,6 +272,7 @@
                                         <input type="text" name="note" id="note_new" value=""/>
                                     </li>
                                     <li>
+                                        <label for="budget_id_new">Fund: </label>
                                         [% PROCESS fund_dropdown form_id => "budget_id_new" form_name => 'budget_id' selected => "" %]
                                     </li>
                                     <li>
@@ -284,7 +285,7 @@
                         [% END #/UNLESS readonly %]
                     </fieldset>
                     [% UNLESS readonly %]
-                        <fieldset class="action" id="submit_invoice_adjustment" style="display:none">
+                        <fieldset class="action" id="submit_invoice_adjustment">
                             <input type="hidden" name="op" value="mod_adj" />
                             <input type="submit" class="btn btn-primary" value="Update adjustments" />
                             <a href="#" id="cancel_invoice_adjustment" class="toggle_invoice_adjustment cancel" style="display:none"><i class="fa fa-times"></i> Cancel</a>
@@ -576,7 +577,7 @@
             updateColumnsVisibility(false);
             $(".toggle_invoice_adjustment").on("click", function(e){
                 e.preventDefault();
-                $("#show_invoice_adjustment, #cancel_invoice_adjustment, #add_invoice_adjustment, #submit_invoice_adjustment").toggle();
+                $("#show_invoice_adjustment, #cancel_invoice_adjustment, #add_invoice_adjustment").toggle();
             });
             $("a.delete_adjustment").click(function(){
                 return ( confirm( _("Are you sure you want to delete this file ?") ) );
-- 
2.30.2