From 2e06546799ba815af805dfe1050dd459463e753a Mon Sep 17 00:00:00 2001
From: Alexandre Noel <alexandre.noel@inlibro.com>
Date: Tue, 18 Jun 2024 14:23:10 -0400
Subject: [PATCH] Bug 35823: When uploading a MARC file to a basket it is
 showing inactive funds without the show checkbox button selected

Prerequisites:
    - Have at least 2 budgets with funds
        1. Add several budgets ("Acquisitions" > "Budget") with funds ("Actions" > "Add fund")
        2. Keep one budget active (check the "Make Budget active" box in
           the budget edit page)
    - Have at least one file of records imported into Koha ("Cataloging" >
      "Stage records for import" > "Upload a file")

To test:
    1. Go to Acquisitions page.
    2. Create a vendor and new basket if not already available.
    3. In your vendor, "Add to the basket" > "From a staged MARC file".
    4. Click "Add orders" of one of the MARC file.
    5. Check the checkbox in the "Select for import" tab.
    6. In the dropdown menu of the "Fund" field, verify the budget
       names.
    --> Ensure Koha displays all inactive budgets even if the "Show
    inactive funds" checkbox is not checked.
    7. Apply patch, and refresh the page (crtl + F5)
    8. Verify the budgets in the "Fund" dropdown menu and test it with
       the "Show inactive funds" checked and uncheked"

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 koha-tmpl/intranet-tmpl/prog/js/funds_sorts.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/js/funds_sorts.js b/koha-tmpl/intranet-tmpl/prog/js/funds_sorts.js
index 75a85e247b..1726ab69c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/funds_sorts.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/funds_sorts.js
@@ -2,9 +2,9 @@
 $(document).ready(function() {
     // keep copy of the inactive budgets
     disabledAllBudgetsCopy = $("select[name='all_budget_id']").html();
-    disabledBudgetsCopy = $("select[name='budget_id']").first().html();
+    disabledBudgetsCopy = $("select[name^='budget_id_']").first().html();
     $("select[name='all_budget_id'] .b_inactive").remove();
-    $("select[name='budget_id'] .b_inactive").remove();
+    $("select[name^='budget_id_'] .b_inactive").remove();
 
     $(".budget_code_item").each(function(){
         let active_only = $(this).clone();
@@ -21,12 +21,12 @@ $(document).ready(function() {
 
     $("#showallbudgets").click(function() {
         if ($(this).is(":checked")) {
-            $("select[name='budget_id']").html(disabledBudgetsCopy)
+            $("select[name^='budget_id_']").html(disabledBudgetsCopy)
             $(".bci_active").prop('disabled',true).prop('hidden',true);
             $(".bci_all").prop('disabled',false).prop('hidden',false);
         }
         else {
-            $("select[name='budget_id'] .b_inactive").remove();
+            $("select[name^='budget_id_'] .b_inactive").remove();
             $(".bci_active").prop('disabled',false).prop('hidden',false);
             $(".bci_all").prop('disabled',true).prop('hidden',true);
         }
@@ -41,7 +41,7 @@ $(document).ready(function() {
         }
     });
 
-    $("select[name='budget_id']").change(function(){
+    $("select[name^='budget_id_']").change(function(){
         var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
         var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
         var destination_sort1 = $(this).parents('fieldset').find('li.sort1').find('input[name="sort1"]');
@@ -59,7 +59,7 @@ $(document).ready(function() {
         getAuthValueDropbox( 'sort2', sort2_authcat, destination_sort2, sort2 );
     } );
 
-    $("select[name='budget_id']").change();
+    $("select[name^='budget_id_']").change();
 
     $("select[name='all_budget_id']").change(function(){
         var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
-- 
2.39.5