https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=23939
Blou <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #115835|0 |1 is obsolete| | --- Comment #4 from Blou <[email protected]> --- Comment on attachment 115835 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=115835 Bug 23939 - Invoice adjustments should filter inactive funds >From 62ec8d38bdb5778ffc015344fb2d0274476bd1cb Mon Sep 17 00:00:00 2001 >From: Blou <[email protected]> >Date: Tue, 26 Jan 2021 15:36:31 -0500 >Subject: [PATCH] Bug 23939 - Invoice adjustments should filter inactive funds > >Looking at invoice details, this makes the Adjustments Fund dropdown act >exactly like the Shipping Fund dropdown above, with a Show inactive >checkbox to help filter (by default) the inactive funds out of the list. > >Test plan: >0) requires a database with inactive (old) funds along with active ones. >1) Go to invoice details page >2) Click "Add adjustment" >3) Open the drop down beside the Fund label, you should see EVERY fund in >database. >4) Compare with behavior of Shipping fund dropdown above. Not every fund is >listed there >5) Apply patch >6) Now behavior is the same, only active fund are listed by default. >7) click "Show inactive" checkbox and see all the funds in the dropdown. >--- > .../prog/en/modules/acqui/invoice.tt | 26 ++++++++++++++++--- > 1 file changed, 22 insertions(+), 4 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 2348004cd6..6638449a4b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt >@@ -278,13 +278,19 @@ > <li> > <label for="budget_id_new">Fund: > </label> > <select id="budget_id_new" > name="budget_id"> >- <option selected="selected" >value="">No fund</option> >+ <option value="">No fund</option> > [% FOREACH budget IN budgets %] >- <option value="[% budget.b_id | >html %]"> >- [% budget.b_txt | html %] >- </option> >+ [% IF ( budget.selected ) %] >+ <option value="[% >budget.b_id | html %]" selected="selected">[% budget.b_txt | html %] [% IF ( >!budget.b_active ) %](inactive)[% END %]</option> >+ [% ELSIF ( budget.b_active ) %] >+ <option value="[% >budget.b_id | html %]">[% budget.b_txt | html %]</option> >+ [% ELSE %] >+ <option value="[% >budget.b_id | html %]" class="ab_inactive">[% budget.b_txt | html %] >(inactive)</option> >+ [% END %] > [% END %] > </select> >+ <label for="showallfunds_adj" >style="float:none;width:auto;"> Show inactive:</label> >+ <input type="checkbox" >id="showallfunds_adj" /> > </li> > <li> > <label for="encumber_new">Encumber > while invoice open? </label> >@@ -516,6 +522,18 @@ > $('.b_inactive').remove(); > } > }); >+ // same effort for the adjustments >+ var adjBudgetId = $("#budget_id_new"); >+ var disabledAdjBudgetsCopy = adjBudgetId.html(); >+ $('.ab_inactive').remove(); >+ $('#showallfunds_adj').click(function() { >+ if ($(this).is(":checked")) { >+ adjBudgetId.html(disabledAdjBudgetsCopy); //Puts back all >the funds >+ } >+ else { >+ $('.ab_inactive').remove(); >+ } >+ }); > }); > </script> > [% END %] >-- >2.17.1 -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
