Attachment 29741 Details for Bug 12164 – Bug 12164: Fix decimal number display

[patch] Bug 12164: Fix decimal number display

Bug-12164-Fix-decimal-number-display.patch (text/plain), 3.21 KB, created by Jonathan Druart on 2014-07-16 09:03:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2014-07-16 09:03:10 UTC

Size: 3.21 KB

patch

obsolete

>From 9c358f29fcc38d0abe367f8c02aefed7fc11392f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>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 <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
>---
> 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' %]
> <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>
>-- 
>2.0.0.rc2

Actions: View | Diff | Splinter Review

Attachments on bug 12164: 27905 | 27906 | 27907 | 27908 | 27909 | 27910 | 27911 | 28588 | 28589 | 28590 | 28591 | 28592 | 28593 | 28695 | 28702 | 28703 | 28704 | 28705 | 28706 | 28707 | 28708 | 29354 | 29355 | 29356 | 29422 | 29423 | 29424 | 29425 | 29426 | 29427 | 29428 | 29429 | 29430 | 29733 | 29734 | 29735 | 29736 | 29737 | 29738 | 29739 | 29740 | 29741 | 30043 | 30044