From 4ad29b9f2e445b718ddfc014adaa27802720d2e5 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 9 Nov 2016 09:13:27 +0000
Subject: [PATCH] Bug 14541: Do not truncate tax rate values

Tax rates are stored in decimal(6,4) fields which means that 4 decimals
are allowed.
If a tax rate is 8.42%, it is stored as 0.0842
If a tax rate has more precision than that, Koha won't deal correctly
with it. We will need to update the DB structure.

With this patch, the tax rate will be displayed with the same precision
as in the DB. So if you enter 8.42, you will see 8.42% instead of 8.4%
without this patch.

Test plan:
Do a full acquisition workflow with a tax rate like 8.42% and confirm
that it is correctly displayed.

Signed-off-by: Alex Buckley <alexbuckley@catalyst.net.nz>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit cb3d6625e87fbc861c11e181cea36f9f9cd329cc)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
(cherry picked from commit ff33093591f903c22e251ba694ed59d8a0fb7500)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt     | 6 +++---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt    | 4 ++--
 .../intranet-tmpl/prog/en/modules/acqui/neworderempty.tt    | 4 ++--
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt   | 6 +++---
 5 files changed, 11 insertions(+), 11 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 4c2c8b7708..1611244c35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -454,7 +454,7 @@
                 [% FOREACH foot_loo IN book_foot_loop %]
                     <tr>
                         <th></th>
-                        <th>Total (GST [% foot_loo.gstrate * 100 | $Price %])</th>
+                        <th>Total (GST [% foot_loo.gstrate * 100 %])</th>
                         <th class="gste">&nbsp;</th>
                         <th class="gste">&nbsp;</th>
                         <th class="gsti">&nbsp;</th>
@@ -558,7 +558,7 @@
                         <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 | $Price %]</td>
                         <td class="number gsti [% IF books_loo.totalgsti.search(zero_regex) %]error[% END %]">[% books_loo.totalgsti | $Price %]</td>
-                        <td class="number">[% books_loo.gstrate * 100 | $Price %]</td>
+                        <td class="number">[% books_loo.gstrate * 100 %]</td>
                         <td class="number [% IF books_loo.gstvalue.search(zero_regex) %]error[% END %]">[% books_loo.gstvalue | $Price %]</td>
                         <td>[% books_loo.budget_name %]</td>
                         <td>[% books_loo.suppliers_report %]</td>
@@ -671,7 +671,7 @@
                     <td class="number">[% order.quantity %]</td>
                     <td class="number gste">[% order.totalgste | $Price %]</td>
                     <td class="number gsti">[% order.totalgsti | $Price %]</td>
-                    <td class="number">[% order.gstrate * 100 | $Price %]</td>
+                    <td class="number">[% order.gstrate * 100 %]</td>
                     <td class="number">[% order.gstvalue | $Price %]</td>
                     <td>[% order.budget_name %]
                   </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
index 5b8ee465b3..5f1f3fe1f3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -173,7 +173,7 @@
                   <td class="number">[% order.quantity %]</td>
                   <td class="number gste">[% order.totalgste | $Price %]</td>
                   <td class="number gsti">[% order.totalgsti | $Price %]</td>
-                  <td class="number">[% order.gstrate * 100 | $Price %]</td>
+                  <td class="number">[% order.gstrate * 100 %]</td>
                   <td class="number">[% order.gstvalue | $Price %]</td>
                   <td>[% order.budget_name %]</td>
                 </tr>
@@ -182,7 +182,7 @@
             <tfoot>
               [% FOR tf IN foot_loop %]
                 <tr>
-                    <th colspan='2'>Total (GST [% tf.gstrate * 100 | $Price %] %)</th>
+                    <th colspan='2'>Total (GST [% tf.gstrate * 100 %] %)</th>
                     <th class="gste"/><th class="gsti"/>
                     <th>[% tf.quantity %]</th>
                     <th class="gste">[% tf.totalgste | $Price %]</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 805b1a6a02..ded47fbb03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -562,9 +562,9 @@ $(document).ready(function()
                         <select name="gstrate" id="gstrate" onchange="updateCosts();">
                         [% FOREACH gst IN gst_values %]
                           [% IF ( gst.option == gstrate ) %]
-                            <option value="[% gst.option %]" selected="selected">[% gst.option * 100 | format("%.1f") %]%</option>
+                            <option value="[% gst.option %]" selected="selected">[% gst.option * 100 %]%</option>
                           [% ELSE %]
-                            <option value="[% gst.option %]">[% gst.option * 100 | format("%.1f") %]%</option>
+                            <option value="[% gst.option %]">[% gst.option * 100 %]%</option>
                           [% END %]
                         [% END %]
                         </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index c66f2f2549..cdc16fa01f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -379,7 +379,7 @@
         </tr>
         [% FOREACH book_foot IN book_foot_loop %]
             <tr>
-                <th colspan="10">Total (GST [% book_foot.gstrate * 100 | $Price %]%)</th>
+                <th colspan="10">Total (GST [% book_foot.gstrate * 100 %]%)</th>
                 <th>[% book_foot.gstvalue | $Price %]</th>
                 <th></th>
             </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index 02e143af7b..c9b5145b69 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -278,9 +278,9 @@ function delete_contact(ev) {
                     <select name="gstrate" id="gstrate">
                     [% FOREACH gst IN gst_values %]
                       [% IF ( gstrate == gst.option ) %]
-                        <option value="[% gst.option %]" selected="selected">[% gst.option * 100 | format ("%.1f") %] %</option>
+                        <option value="[% gst.option %]" selected="selected">[% gst.option * 100 %] %</option>
                       [% ELSE %]
-                        <option value="[% gst.option %]">[% gst.option * 100 | format ("%.1f") %] %</option>
+                        <option value="[% gst.option %]">[% gst.option * 100 %] %</option>
                       [% END %]
                     [% END %]
                     </select>
@@ -340,7 +340,7 @@ function delete_contact(ev) {
                 <p><strong>Discount: </strong>
                     [% discount | format("%.1f") %] %</p>
                 <p><strong>Tax rate: </strong>
-                    [% 0 + gstrate * 100 | format("%.1f") %] %</p>
+                    [% 0 + gstrate * 100 %] %</p>
                 [% IF deliverytime.defined %]
                     <p><strong>Delivery time: </strong>
                         [% deliverytime %] days</p>