Bug 13320: Fix "Tax inc." vs "Tax exc."
authorJonathan Druart <jonathan.druart@biblibre.com>
Wed, 21 Jan 2015 08:56:42 +0000 (09:56 +0100)
committerTomas Cohen Arazi <tomascohen@gmail.com>
Wed, 4 Feb 2015 18:16:15 +0000 (15:16 -0300)
The parcel page always displayes "Tax exc." even when values don't
include taxes.

Test plan:
On the parcel page, verify that the string "Tax *" is correct.
This appears in the already received order table.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt

index 24e855a..a244f5f 100644 (file)
     <tfoot>
         [% FOREACH key IN subtotal_for_funds.keys.sort %]
             <tr>
-                <td colspan="6" class="total">(Tax exc.)</td>
+                [% IF invoiceincgst %]
+                    <td colspan="6" class="total">(Tax inc.)</td>
+                [% ELSE %]
+                    <td colspan="6" class="total">(Tax exc.)</td>
+                [% END %]
                 <td colspan="2"><i>Subtotal for</i> [% funds.$key.budget_name %]</td>
                 <td>[% subtotal_for_funds.$key.ecost | $Price %]</td>
                 <td>[% subtotal_for_funds.$key.unitprice | $Price  %]</td>