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

[Owen Leonard]

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

Modified files:
        koha-tmpl/intranet-tmpl/npl/en/acqui: basket.tmpl newbiblio.tmpl 
                                              recieveorder.tmpl 

Log message:
        Enabling GST system preference to control display of GST values

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

Patches:
Index: basket.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/basket.tmpl,v
retrieving revision 1.2.2.7
retrieving revision 1.2.2.8
diff -u -b -r1.2.2.7 -r1.2.2.8
--- basket.tmpl 8 Aug 2006 15:21:09 -0000       1.2.2.7
+++ basket.tmpl 13 Sep 2006 19:28:26 -0000      1.2.2.8
@@ -86,8 +86,8 @@
                                </tr>
                        <!-- /TMPL_LOOP -->
                        
-                       <tr>
-                               <td colspan="2" rowspan="3">&nbsp;</td>
+<!-- TMPL_IF NAME="GST" -->                    <tr>
+                               <td colspan="2">&nbsp;</td>
                                <th>SubTotal</th>
                                <th><!-- TMPL_VAR NAME="sub_total_est" --></th>
                                <th>&nbsp;</th>
@@ -97,13 +97,16 @@
                                
                        </tr>
                        <tr>
+                               <td colspan="2">&nbsp;</td>
                                <th>GST</th>
                                <th><!-- TMPL_VAR NAME="gist_est" --></th>
                                <th>&nbsp;</th>
                                <th>&nbsp;</th>
                                <th><!-- TMPL_VAR NAME="gist" --></th>
                        </tr>
+<!-- /TMPL_IF -->
                        <tr>
+                               <td colspan="2">&nbsp;</td>
                                <th>TOTAL  (<!-- TMPL_VAR NAME="currency" 
-->)</th>
                                <th><!-- TMPL_VAR NAME="grand_total_est" 
--></th>
                                <th>&nbsp;</th>

Index: newbiblio.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/newbiblio.tmpl,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -b -r1.2.2.6 -r1.2.2.7
--- newbiblio.tmpl      7 Jul 2006 14:56:12 -0000       1.2.2.6
+++ newbiblio.tmpl      13 Sep 2006 19:28:26 -0000      1.2.2.7
@@ -154,7 +154,7 @@
                                <input type="text" size="20" id="rrp" 
name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
                        <!--/TMPL_IF--></td></tr>
                <tr><th><label for="ecost">Budgeted Cost</label></th><td><input 
type="text" size="20" id="ecost" name="ecost" value="<!-- TMPL_VAR NAME="ecost" 
-->"<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF--> 
/></td></tr>
-               <tr><th><label for="GST">Budgeted GST</label></th><td><input 
type="text" size="20" id="GST" name="GST" value=""<!-- TMPL_IF name="close" --> 
readonly="readonly"<!--/TMPL_IF-->  /></td></tr>
+               <!-- TMPL_IF NAME="haveGST" --><tr><th><label 
for="GST">Budgeted GST</label></th><td><input type="text" size="20" id="GST" 
name="GST" value=""<!-- TMPL_IF name="close" --> 
readonly="readonly"<!--/TMPL_IF-->  /></td></tr><!-- /TMPL_IF -->
                <tr><th><label for="total"><strong>BUDGETED 
TOTAL</strong></label></th><td><input type="text" size="20" id="total" 
name="total" value=""<!-- TMPL_IF name="close" --> 
readonly="readonly"<!--/TMPL_IF--> /></td></tr>
                <tr><th><label for="cost">Actual Cost</label></th><td><input 
type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR 
name="ecost"-->"<!-- TMPL_IF name="close" --> 
readonly="readonly"<!--/TMPL_IF--> /></td></tr>
                <tr><th><label for="invoice">Invoice Number 
*</label></th><td><input type="text" size="20" id="invoice" name="invoice"  
value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>

Index: recieveorder.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/recieveorder.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
--- recieveorder.tmpl   31 Jul 2006 16:07:16 -0000      1.1.2.4
+++ recieveorder.tmpl   13 Sep 2006 19:28:26 -0000      1.1.2.5
@@ -84,8 +84,8 @@
                        <label for="invoice">Parcel Code</label></th>
                        <td><input type="text" size="20" id="invoice" 
name="invoice" /></td></tr>
                
-                       <tr><th><label for="gst">GST</label></th>
-               <td>    <input type="text" size="20" id="gst" name="gst" 
/></td></tr>
+       <!-- TMPL_IF NAME="GST" -->             <tr><th><label 
for="gst">GST</label></th>
+               <td>    <input type="text" size="20" id="gst" name="gst" 
/></td></tr><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- 
/TMPL_IF -->
                
                        <tr><th><label for="freight">Freight</label></th>
                        <td><input type="text" size="20" id="freight" 
name="freight" /></td></tr>