Bug 10862: (follow-up) fix a couple of issues

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / addorderiso2709.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index a6a099a..6f51956 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -26,14 +26,14 @@
             "aaSorting": []
         } ) );
 
-        //keep a copy of all budgets before removing the inactives
+        // keep copy of the inactive budgets
         disabledBudgetsCopy = $("select[name='all_budget_id']").html();
         $("select[name='all_budget_id'] .b_inactive").remove();
         $("select[name='budget_id'] .b_inactive").remove();
 
         $("#showallbudgets").click(function() {
             if ($(this).is(":checked")) {
-                $("select[name='budget_id']").html(disabledBudgetsCopy); //Puts back all the funds
+                $("select[name='budget_id']").html(disabledBudgetsCopy)
             }
             else {
                 $("select[name='budget_id'] .b_inactive").remove();
@@ -42,7 +42,7 @@
 
         $("#all_showallbudgets").click(function() {
             if ($(this).is(":checked")) {
-                $("select[name='all_budget_id']").html(disabledBudgetsCopy); //Puts back all the funds
+                $("select[name='all_budget_id']").html(disabledBudgetsCopy);
             }
             else {
                 $("select[name='all_budget_id'] .b_inactive").remove();
@@ -142,7 +142,7 @@
     });
 
     function disableUnchecked(form){
-        $("div.biblio.unselected").each(function(){
+        $("fieldset.biblio.unselected").each(function(){
             $(this).remove();
         });
         return 1;
@@ -235,10 +235,14 @@
                                     <option value="">Select a fund</option>
                                     [% FOREACH budget IN budget_loop %]
                                         [% IF ( budget.b_id == biblio.budget_id ) %]
+                                          [% IF budget.b_active %]
                                             <option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]" selected="selected">[% budget.b_txt %]</option>
+                                          [% ELSE %]
+                                            <option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]" selected="selected">[% budget.b_txt %] (inactive)</option>
+                                          [% END %]
                                         [% ELSE %]
                                             [% IF budget.b_active %]<option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option>
-                                            [% ELSE %]<option value="[% budget.b_id %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option>
+                                            [% ELSE %]<option value="[% budget.b_id %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %] (inactive)</option>
                                             [% END %]
                                         [% END %]
                                     [% END %]
@@ -327,7 +331,7 @@
                                               <option value="">Select a fund</option>
                                             [% FOREACH budget_loo IN budget_loop %]
                                                 [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
-                                                [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
+                                                [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %] (inactive)</option>
                                                 [% END %]
                                             [% END %]
                                             </select>