From df6df6f7e2e43de95afe5583f0fd0579b88767fd Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 1 Dec 2014 14:17:36 +0100
Subject: [PATCH] Bug 13320: Fix "Tax inc." vs "Tax exc."

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>
---
 acqui/parcel.pl                                         | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/acqui/parcel.pl b/acqui/parcel.pl
index 15ae0f2..92d29cc 100755
--- a/acqui/parcel.pl
+++ b/acqui/parcel.pl
@@ -285,6 +285,7 @@ $template->param(
     formatteddatereceived => $datereceived->output(),
     name                  => $bookseller->{'name'},
     booksellerid          => $bookseller->{id},
+    invoiceincgst         => $bookseller->{invoiceincgst},
     loop_received         => \@loop_received,
     loop_orders           => \@loop_orders,
     book_foot_loop        => \@book_foot_loop,
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 2032dd7..9e309a6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -347,7 +347,11 @@
     <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> [% key %]</td>
                 <td>[% subtotal_for_funds.$key.ecost | $Price %]</td>
                 <td>[% subtotal_for_funds.$key.unitprice | $Price  %]</td>
-- 
2.1.0