[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/acqui b... [rel_2_2]
|
From: |
Owen Leonard |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/acqui b... [rel_2_2] |
|
Date: |
Wed, 13 Sep 2006 19:28:23 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Owen Leonard <oleonard> 06/09/13 19:28:23
Modified files:
koha-tmpl/intranet-tmpl/default/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/default/en/acqui/basket.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.15.2.13&r2=1.15.2.14
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.15.2.6&r2=1.15.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.10.2.3&r2=1.10.2.4
Patches:
Index: basket.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.15.2.13
retrieving revision 1.15.2.14
diff -u -b -r1.15.2.13 -r1.15.2.14
--- basket.tmpl 2 Aug 2006 08:33:20 -0000 1.15.2.13
+++ basket.tmpl 13 Sep 2006 19:28:23 -0000 1.15.2.14
@@ -32,7 +32,7 @@
<th class="acquisition doNotPrint">Order</th>
<th class="acquisition">Publisher<span
class="doNotPrint"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno"
-->&order=biblioitems.publishercode" class="acquisition">[order]</a></span></th>
<th class="acquisition">Title</th>
- <th class="acquisition doNotPrint">rrp</th>
+ <th class="acquisition doNotPrint"
title="Recommended Retail Price">RRP</th>
<th class="acquisition">est</th>
<th class="acquisition">Qty</th>
<th class="acquisition">Total</th>
@@ -94,33 +94,33 @@
</td>
<td class="acquisition number">
- <p>Sub total</p>
- <p>GST</p>
+ <!-- TMPL_IF NAME="GST" --><p>Sub
total</p>
+ <p>GST</p><!-- /TMPL_IF -->
<p>TOTAL (<!-- TMPL_VAR NAME="currency"
-->)</p>
</td>
<td class="acquisition number">
- <p><!-- TMPL_VAR NAME="sub_total_est"
--></p>
- <p><!-- TMPL_VAR NAME="gist_est" --></p>
+ <!-- TMPL_IF NAME="GST" --><p><!--
TMPL_VAR NAME="sub_total_est" --></p>
+ <p><!-- TMPL_VAR NAME="gist_est"
--></p><!-- /TMPL_IF -->
<p><!-- TMPL_VAR NAME="grand_total_est"
--></p>
</td>
<td class="acquisition doNotPrint">
- <p> </p>
- <p> </p>
+ <!-- TMPL_IF NAME="GST" --><p> </p>
+ <p> </p><!-- /TMPL_IF -->
<p> </p>
</td>
<td class="acquisition number">
- <p><!-- TMPL_VAR name="qty_total"
--></p>
- <p> </p>
+ <!-- TMPL_IF NAME="GST" --><p><!--
TMPL_VAR name="qty_total" --></p>
+ <p> </p><!-- /TMPL_IF -->
<p> </p>
</td>
<td class="acquisition number">
- <p><!-- TMPL_VAR NAME="sub_total"
--></p>
- <p><!-- TMPL_VAR NAME="gist" --></p>
+ <!-- TMPL_IF NAME="GST" --><p><!--
TMPL_VAR NAME="sub_total" --></p>
+ <p><!-- TMPL_VAR NAME="gist"
--></p><!-- /TMPL_IF -->
<p><!-- TMPL_VAR NAME="grand_total"
--></p>
</td>
- <td class="acquisition">
- <p> </p>
- <p> </p>
+ <td colspan="3" class="acquisition">
+ <!-- TMPL_IF NAME="GST" --><p> </p>
+ <p> </p><!-- /TMPL_IF -->
<p> </p>
</td>
</tr>
Index: newbiblio.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.15.2.6
retrieving revision 1.15.2.7
diff -u -b -r1.15.2.6 -r1.15.2.7
--- newbiblio.tmpl 4 Apr 2006 13:56:44 -0000 1.15.2.6
+++ newbiblio.tmpl 13 Sep 2006 19:28:23 -0000 1.15.2.7
@@ -96,7 +96,7 @@
</h1>
Shopping Basket For <!-- TMPL_VAR NAME="name" -->
<div id="bloc25">
- <h2 class="acquisition">catalogue details</h2>
+ <h2 class="acquisition">Catalogue details</h2>
<p>
<label class="label100"><b>Title *</b></label>
<!-- TMPL_IF name="biblio" -->
@@ -192,10 +192,10 @@
<label class="label100">Budgeted Cost</label>
<input type="text" size="20" name="ecost" value="<!--
TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
</p>
- <p>
+<!-- TMPL_IF NAME="GST" --> <p>
<label class="label100">Budgeted GST</label>
- <input type="text" size="20" name="GST" value="" <!--
TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
- </p>
+ <input type="text" size="20" name="GST" value="<!--
TMPL_VAR NAME="GST" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
+ </p><!-- TMPL_ELSE --><input type="hidden" name="GST"
value="0"><!-- /TMPL_IF -->
<p>
<label class="label100"><b>BUDGETED TOTAL</b></label>
<input type="text" size="20" name="total" value="" <!--
TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
Index: recieveorder.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -b -r1.10.2.3 -r1.10.2.4
--- recieveorder.tmpl 4 Apr 2006 13:56:45 -0000 1.10.2.3
+++ recieveorder.tmpl 13 Sep 2006 19:28:23 -0000 1.10.2.4
@@ -108,10 +108,10 @@
<label>Parcel Code</label>
<input type="text" size="20" name="invoice">
</p>
- <p>
+<!-- TMPL_IF NAME="GST" --> <p>
<label>GST</label>
<input type="text" size="20" name="gst">
- </p>
+ </p><!-- TMPL_ELSE --><input type="hidden" name="gst"
value="0"><!-- /TMPL_IF -->
<p>
<label>Freight</label>
<input type="text" size="20" name="freight">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/acqui b... [rel_2_2],
Owen Leonard <=