From 9a4c7de37d12008b8d658f0df3e23472e03cc591 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Thu, 19 Sep 2013 17:03:00 +0200
Subject: [PATCH] Bug 9374: The color should manage all zero format.
The format of prices in Koha is discuted in some bugs (e.g. 9410).
The good way will be to introduce a syspref in order to deal with the
number of decimal.
The previous patch is too restrictive, we should deal with other zero
format.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
---
.../intranet-tmpl/prog/en/modules/acqui/basket.tt | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
index 3558616..10cc1ff 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -367,15 +367,16 @@
</p>
[% END %]
</td>
- <td class="number gste [% IF books_loo.rrpgste.search('^0.00') %]error[% END %]">[% books_loo.rrpgste %]</td>
- <td class="number gste [% IF books_loo.ecostgste.search('^0.00') %]error[% END %]">[% books_loo.ecostgste %]</td>
- <td class="number gsti [% IF books_loo.rrpgsti.search('^0.00') %]error[% END %]">[% books_loo.rrpgsti %]</td>
- <td class="number gsti [% IF books_loo.ecostgsti.search('^0.00') %]error[% END %]">[% books_loo.ecostgsti %]</td>
- <td class="number [% IF books_loo.quantity.search('^0.00') %]error[% END %]">[% books_loo.quantity %]</td>
- <td class="number gste [% IF books_loo.totalgste.search('^0.00') %]error[% END %]">[% books_loo.totalgste %]</td>
- <td class="number gsti [% IF books_loo.totalgsti.search('^0.00') %]error[% END %]">[% books_loo.totalgsti %]</td>
- <td class="number [% IF books_loo.gstgsti.search('^0.00') %]error[% END %]">[% books_loo.gstgsti %]</td>
- <td class="number [% IF books_loo.gstvalue.search('^0.00') %]error[% END %]">[% books_loo.gstvalue %]</td>
+ [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
+ <td class="number gste [% IF books_loo.rrpgste.search(zero_regex) %]error[% END %]">[% books_loo.rrpgste %]</td>
+ <td class="number gste [% IF books_loo.ecostgste.search(zero_regex) %]error[% END %]">[% books_loo.ecostgste %]</td>
+ <td class="number gsti [% IF books_loo.rrpgsti.search(zero_regex) %]error[% END %]">[% books_loo.rrpgsti %]</td>
+ <td class="number gsti [% IF books_loo.ecostgsti.search(zero_regex) %]error[% END %]">[% books_loo.ecostgsti %]</td>
+ <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity %]</td>
+ <td class="number gste [% IF books_loo.totalgste.search(zero_regex) %]error[% END %]">[% books_loo.totalgste %]</td>
+ <td class="number gsti [% IF books_loo.totalgsti.search(zero_regex) %]error[% END %]">[% books_loo.totalgsti %]</td>
+ <td class="number [% IF books_loo.gstgsti.search(zero_regex) %]error[% END %]">[% books_loo.gstgsti %]</td>
+ <td class="number [% IF books_loo.gstvalue.search(zero_regex) %]error[% END %]">[% books_loo.gstvalue %]</td>
<td>[% books_loo.budget_name %]</td>
[% IF ( active ) %]
[% UNLESS ( closedate ) %]
--
1.7.10.4