@@ -, +, @@ - CloneBudgetPeriod - CloneBudgetHierarchy - MoveOrders - OK Existing budget is active, duplicate it and mark it inactive - OK Existing budget is inactive, duplicate and mark it inactive - OK Budget was created without funds - no changes are made - OK Budget was created with funds, all orders moved correctly - moving the available money to the new budget is optional - OK Budget was created with funds, but one fund deleted, all orders moved correctly, one missing fund reported, orders unchanged - OK Partial receive from last budget is undone, order lines are correctly recombined and fund is set to the current budget --- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -1,4 +1,5 @@ [% USE KohaDates %] +[% USE format %] [% INCLUDE 'doc-head-open.inc' %] [% INCLUDE 'doc-head-close.inc' %] @@ -462,7 +463,7 @@ [% IF r.orders_moved.size > 0 %] [% FOR order IN r.orders_moved %] - [% r.budget.budget_name %] (id=[% r.budget.budget_id %]) Amount=[% r.budget.budget_amount %][% IF r.unspent_moved %] ([% r.unspent_moved %] remaining has been moved)[% END %] + [% r.budget.budget_name %] (id=[% r.budget.budget_id %]) Amount=[% r.budget.budget_amount | format ("%.2f") %][% IF r.unspent_moved %] ([% r.unspent_moved | format ("%.2f")%] remaining has been moved)[% END %] [% order.basketname %] [% order.ordernumber %] Moved! @@ -479,7 +480,7 @@ [% ELSE %] [% IF r.error == 'budget_code_not_exists' %] - [% r.budget.budget_id %] [% r.budget.budget_amount %][% IF r.unspent_moved %] ([% r.unspent_moved %] remaining has been moved)[% END %] + [% r.budget.budget_id %] [% r.budget.budget_amount | format ("%.2f") %][% IF r.unspent_moved %] ([% r.unspent_moved | format ("%.2f") %] remaining has been moved)[% END %] This fund code does not exist in the destination budget. --