From cc45760f1f8d75d7f2d946cdcd75a497332515fd Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 7 Jan 2023 00:46:20 +0100 Subject: [PATCH] Bug 32400: (follow-up) Add page-section to table of moved orders To test: * Make sure you have at least one open order, basket closed * Go to Administration > budgets * Clone the budget * Close the budget * Choose your new budget and save * Confirm 'can't undo later...' question * Verify the table of moved orders has the white background from the added page-section --- .../prog/en/modules/admin/aqbudgetperiods.tt | 91 ++++++++++--------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index a4fd620120..78ef29164a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -415,52 +415,55 @@ [% END %] [% ELSIF closed %]

Budget [% budget_period_description | html %] closed

-

Report after moving unreceived orders from budget [% from_budget_period.budget_period_description | html %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% from_budget_period.budget_period_enddate | $KohaDates %]) to [% to_budget_period.budget_period_description | html %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])

- - - - - - - - - - - - [% FOR r IN report %] - [% IF r.moved %] - [% IF r.orders_moved.size > 0 %] - [% FOR order IN r.orders_moved %] - - - - - - + +
+

Report after moving unreceived orders from budget [% from_budget_period.budget_period_description | html %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% from_budget_period.budget_period_enddate | $KohaDates %]) to [% to_budget_period.budget_period_description | html %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])

+ +
Budget idBasketOrdernumberDetails
[% r.budget.budget_name | html %] (id=[% r.budget.budget_id | html %]) Amount=[% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %][% order.basketname | html %][% order.ordernumber | html %]Moved!
+ + + + + + + + + + [% FOR r IN report %] + [% IF r.moved %] + [% IF r.orders_moved.size > 0 %] + [% FOR order IN r.orders_moved %] + + + + + + + [% END %] + [% ELSE %] + + + + + + + [% END %] + [% ELSE %] + [% IF r.error == 'budget_code_not_exists' %] + + + + + + + [% END %] [% END %] - [% ELSE %] - - - - - - - [% END %] - [% ELSE %] - [% IF r.error == 'budget_code_not_exists' %] - - - - - - - [% END %] + [% END %] - - [% END %] - -
Budget idBasketOrdernumberDetails
[% r.budget.budget_name | html %] (id=[% r.budget.budget_id | html %]) Amount=[% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %][% order.basketname | html %][% order.ordernumber | html %]Moved!
[% r.budget.budget_name | html %] (id=[% r.budget.budget_id | html %])There were no unreceived orders for this fund.
[% r.budget.budget_id | html %] [% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %]This fund code does not exist in the destination budget.
[% r.budget.budget_name | html %] (id=[% r.budget.budget_id | html %])There were no unreceived orders for this fund.
[% r.budget.budget_id | html %] [% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %]This fund code does not exist in the destination budget.
- Back + + + Back + [% END %] -- 2.30.2