From 5ae7554667a209962a169f3a3b1d4b5b4beb398c Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Thu, 16 Jul 2015 12:14:42 -0400
Subject: [PATCH] Bug 14543: Order lines updated that have a tax rate not in
 gist will have tax rate set to 0!

If the tax rate for a given order line has been removed from the system
preference gist, that tax rate will show in the pulldown as 0. If a
librarian then saves the order line the original tax rate will be
overwritten with 0%!

Test Plan:
1) Find an order line
2) Remove the tax rate set for that order line from the syspref gist
3) Edit the order line
4) Note the tax rate is 0
5) Apply this patch
6) Edit the order line
7) Note the tax rate now displays with a warning

Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/acqui/neworderempty.tt    | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

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 ed546f7515..1daf00244e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -391,14 +391,22 @@
                 <li>
                     <label for="tax_rate">Tax rate: </label>
                     <select name="tax_rate" id="tax_rate" onchange="updateCosts();">
-                    [% FOREACH gst IN gst_values %]
-                      [% IF ( gst.option == tax_rate ) %]
-                        <option value="[% gst.option | html %]" selected="selected">[% gst.option * 100 | html %]%</option>
-                      [% ELSE %]
-                        <option value="[% gst.option | html %]">[% gst.option * 100 | html %]%</option>
-                      [% END %]
-                    [% END %]
+                        [% SET gst_found = 0 %]
+                        [% FOREACH gst IN gst_values %]
+                          [% IF ( gst.option == tax_rate ) %]
+                            <option value="[% gst.option | html %]" selected="selected">[% gst.option * 100 | html %]%</option>
+                            [% SET gst_found = 1 %]
+                          [% ELSE %]
+                            <option value="[% gst.option | html %]">[% gst.option * 100 | html %]%</option>
+                          [% END %]
+                        [% END %]
+
+                        [% IF !gst_found %]
+                            <option value="[% tax_rate %]" selected="selected">[% tax_rate * 100 | html %]%</option>
+                        [% END %]
                     </select>
+
+                    [% IF !gst_found %]<span class="required">Tax rate not defined in system preference gist!</span>[% END %]
             [% ELSE %]
                     <input type="hidden" name="tax_rate" value="0" />
                 </li>
-- 
2.39.5