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 <Katrin.Fischer.83@web.de> 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 Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
parent
b64490cb48
commit
359590f36a
1 changed files with 3 additions and 2 deletions
|
@ -1,4 +1,5 @@
|
|||
[% USE KohaDates %]
|
||||
[% USE format %]
|
||||
[% INCLUDE 'doc-head-open.inc' %]
|
||||
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
|
||||
[% INCLUDE 'doc-head-close.inc' %]
|
||||
|
@ -462,7 +463,7 @@
|
|||
[% IF r.orders_moved.size > 0 %]
|
||||
[% FOR order IN r.orders_moved %]
|
||||
<tr>
|
||||
<td>[% 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 %]</td>
|
||||
<td>[% 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 %]</td>
|
||||
<td>[% order.basketname %]</td>
|
||||
<td>[% order.ordernumber %]</td>
|
||||
<td>Moved!</td>
|
||||
|
@ -479,7 +480,7 @@
|
|||
[% ELSE %]
|
||||
[% IF r.error == 'budget_code_not_exists' %]
|
||||
<tr>
|
||||
<td>[% r.budget.budget_id %] [% r.budget.budget_amount %][% IF r.unspent_moved %] ([% r.unspent_moved %] remaining has been moved)[% END %]</td>
|
||||
<td>[% r.budget.budget_id %] [% r.budget.budget_amount | format ("%.2f") %][% IF r.unspent_moved %] ([% r.unspent_moved | format ("%.2f") %] remaining has been moved)[% END %]</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>This fund code does not exist in the destination budget.</td>
|
||||
|
|
Loading…
Reference in a new issue