From 9c358f29fcc38d0abe367f8c02aefed7fc11392f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 30 Jun 2014 12:05:46 +0200 Subject: [PATCH] Bug 12164: Fix decimal number display If the funds are not moved, the amount is display like 123.000000. This patch hardcodes the number of decimal numbers to display (2). Signed-off-by: Katrin Fischer Passes QA script and tests, especially all acquisition tests. New routines in Budgets.pm: - CloneBudgetPeriod - CloneBudgetHierarchy - MoveOrders OK t/db_dependent/Budgets.t Some of the tests done: 1) Duplicate an existing budget - OK Existing budget is active, duplicate it and mark it inactive - OK Existing budget is inactive, duplicate and mark it inactive 2) Close budget - 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 3) Partial receiced undone - 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(-) 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 3001978..31139ab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/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. -- 2.0.0.rc2