From 27f1df06700d19d006218812c168fc9079e3706d Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Thu, 3 Apr 2014 14:15:11 +0200 Subject: [PATCH] Bug 9088: if there is only one active order, pre-select it when creating new orderings This patch makes the following changes to the template: [1] If you add an order line, and you have one active fund (and zero or more inactive funds), the only active fund is preselected. [2] If you modify an order line while its fund is inactive, it now shows the label (inactive) behind the fund name. (Note that other inactive funds may come up when clicking 'Show all' as they did before.) [3] Corrected some indentation in this template part. Test plan: [1] Add an order line while having one active fund. Is it selected? [2] Add an order line while having two or more active funds. No fund should be preselected. [3] Modify an order line with an active fund. Is it still selected? [4] Modify an order line with an inactive fund F2 (while having one active fund F1; note that this test explicitly wants F1 to be before F2). Check if F2 is selected and is labeled inactive. [5] (Bonus points:) Modify an order line that refers to a deleted fund. If you edit this order, the fund combo should say: Select a fund. (Note: if you delete a fund, the budget_id in aqorders remains.) Signed-off-by: Paola Rossi I test against master 3.15.00.051 I test against all the three options of the AcqCreateItem: placing an order receiving an order cataloging the record All is OK. Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- .../prog/en/modules/acqui/neworderempty.tt | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt index 9bb2b8ca85..64ad02809e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -432,16 +432,26 @@ $(document).ready(function() [% Budget_name %] [% ELSE %] + [% active_count = 0 %] + [% IF !ordernumber %] + [% FOREACH budget_loo IN budget_loop %] + [% active_count= active_count + budget_loo.b_active %] + [% END %] + [% END %] -- 2.39.5