[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/acqui suppl... [rel_2_2]

[Owen Leonard]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Owen Leonard <oleonard> 06/09/13 19:25:19

Modified files:
        koha-tmpl/intranet-tmpl/npl/en/acqui: supplier.tmpl 

Log message:
        Enabling GST system preference to control display of GST values. Other 
minor markup corrections.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/supplier.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.4&r2=1.1.2.5

Patches:
Index: supplier.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/supplier.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- supplier.tmpl       20 Jun 2006 16:21:43 -0000      1.1.2.4
+++ supplier.tmpl       13 Sep 2006 19:25:19 -0000      1.1.2.5
@@ -79,8 +79,8 @@
                </td>
        </tr>
        <tr>
-               <th><label for="notes">Notes</label></th>
-               <td><textarea id="notes" name="notes" cols="20" rows="4"><!-- 
TMPL_VAR name="contnotes" --></textarea>
+               <th><label for="notes1">Notes</label></th>
+               <td><textarea id="notes1" name="notes" cols="20" rows="4"><!-- 
TMPL_VAR name="contnotes" --></textarea>
                </td>
        </tr>
 </table></div>
@@ -94,7 +94,7 @@
        </tr>
 </table></div>
 
-<div class="details">
+<div class="data">
 <table>
        <caption>Ordering Information</caption>
        <tr>
@@ -122,7 +122,7 @@
                        </select>
                </td>
        </tr>
-       <tr>
+       <!-- TMPL_IF NAME="GST" --><tr>
                <th><label for="gst">GST Registered</label></th>
                <td>
                        <input type="radio" id="gst" name="gst" value="1"<!-- 
TMPL_IF name="gstreg" --> checked="checked"<!-- /TMPL_IF --> />Yes
@@ -142,15 +142,19 @@
                        <input type="radio" id="invoice_gst" name="invoice_gst" 
value="1"<!-- TMPL_IF name= "invoiceincgst" --> checked="checked"<!-- /TMPL_IF 
--> />Yes
                        <input type="radio" name="invoice_gst" value="0"<!-- 
TMPL_UNLESS name="invoiceincgst" --> checked="checked"<!-- /TMPL_UNLESS --> />No
                </td>
-       </tr>
+       </tr><!-- TMPL_ELSE -->
+       <input type="hidden" name="gst" value="0" />
+       <input type="hidden" name="list_gst" value="0" />
+       <input type="hidden" name="invoice_gst" value="0" />
+       <!-- /TMPL_IF -->
        <tr>
                <th><label for="discount">Discount</label></th>
                <td><input type="text" size="3" id="discount" name="discount" 
value="<!-- TMPL_VAR name="discount" -->" /> %</td>
        </tr>
        <tr>
                <th>
-                       <label for="notes">Notes</label></th><td>
-                       <textarea cols="40" rows="4" name="notes" 
id="notes"><!-- TMPL_VAR NAME="notes" --></textarea>
+                       <label for="notes2">Notes</label></th><td>
+                       <textarea cols="40" rows="4" name="notes" 
id="notes2"><!-- TMPL_VAR NAME="notes" --></textarea>
 </td>
        </tr>
 </table>
@@ -249,7 +253,7 @@
                <tr><th>
                        Invoice Prices are: </th><td><!--TMPL_VAR 
Name="invoiceprice"-->
                </td></tr>
-               <tr><th>
+<!-- TMPL_IF NAME="GST" -->            <tr><th>
                        GST Registered: </th><td>
                                <!-- TMPL_IF name="gstreg" 
-->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
                </td></tr>
@@ -260,7 +264,7 @@
                <tr><th>
                        Invoice Item Price Includes GST: </th><td>
                                <!-- TMPL_IF name= "invoiceincgst" 
-->Yes<!--TMPL_ELSE-->No<!-- /TMPL_IF -->
-               </td></tr>
+               </td></tr><!-- /TMPL_IF -->
                <tr><th>
                        Discount: </th><td>
                        <!-- TMPL_VAR NAME="discount" --> %