A couple of changes towards fixing Bug 1165 (GST in PROG templates)

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/acqui/parcels.pl b/acqui/parcels.pl
index 14e4013..bdf82f6 100755 (executable)
--- a/acqui/parcels.pl
+++ b/acqui/parcels.pl
@@ -162,6 +162,7 @@ $template->param(orderby=>$order, filter=>$code, datefrom=>$datefrom,dateto=>$da
 $template->param(
         name => $booksellers[0]->{'name'},
         supplierid => $supplierid,
+           GST => C4::Context->preference("gist"),
         );
 
 output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
index 01d4cd3..80e0203 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tmpl
@@ -112,7 +112,7 @@
             <label for="gst">GST:</label>
             <input type="text" size="20" id="gst" name="gst" />
         </li>
-               <!-- /TMPL_IF -->
+               <!--/TMPL_IF-->
         <li>
             <label for="freight">Freight:</label>
             <input type="text" size="20" id="freight" name="freight" />

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
index 7de2441..44aa598 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tmpl
@@ -184,12 +184,12 @@ function confirm_deletion() {
                 <!-- TMPL_VAR NAME="specialty" --></p>
             <p><strong>List Prices are: </strong><!--TMPL_VAR Name="listprice"--></p>
             <p><strong>Invoice Prices are: </strong><!--TMPL_VAR Name="invoiceprice"--></p>
-            <p><strong>GST Registered: </strong>
+            <!-- TMPL_IF NAME="GST" --><p><strong>GST Registered: </strong>
                     <!-- TMPL_IF name="gstreg" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
             <p><strong>List Item Price Includes GST: </strong>
                     <!-- TMPL_IF name="listincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
             <p><strong>Invoice Item Price Includes GST: </strong>
-                    <!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p>
+                    <!-- TMPL_IF name= "invoiceincgst" -->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF --></p><!-- /TMPL_IF -->
             <p><strong>Discount: </strong>
                 <!-- TMPL_VAR NAME="discount" --> %</p>
             <!-- TMPL_IF NAME="notes" --><p><strong>Notes: </strong>