[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui basket.tmpl,1.12,1.13

[Paul POULAIN]

Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18281/koha-tmpl/intranet-tmpl/default/en/acqui

Modified Files:
	basket.tmpl 
Log Message:
* removing the hard coded $
* adding bookfund to the order list

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** basket.tmpl	17 Sep 2004 12:32:30 -0000	1.12
--- basket.tmpl	4 Oct 2004 20:03:24 -0000	1.13
***************
*** 23,35 ****
  		<table>
  			<tr valign="top" bgcolor="#ffdf61">
! 				<th class="acquisition" width="5%">Order</th>
! 				<th class="acquisition" width="10%">Publisher</th>
! 				<th class="acquisition" width="10%">Isbn</th>
! 				<th class="acquisition" width="30%">Title</th>
! 				<th class="acquisition" width="20%">Author</th>
! 				<th class="acquisition" width="5%">$ rrp</th>
! 				<th class="acquisition" width="7%">$est</th>
! 				<th class="acquisition" width="7%">Qty</th>
! 				<th class="acquisition" width="7%">Total</th>
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
--- 23,36 ----
  		<table>
  			<tr valign="top" bgcolor="#ffdf61">
! 				<th class="acquisition">Order</th>
! 				<th class="acquisition">Publisher</th>
! 				<th class="acquisition">Isbn</th>
! 				<th class="acquisition">Title</th>
! 				<th class="acquisition">Author</th>
! 				<th class="acquisition">rrp</th>
! 				<th class="acquisition">est</th>
! 				<th class="acquisition">Qty</th>
! 				<th class="acquisition">Total</th>
! 				<th class="acquisition">Book fund</th>
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 44,47 ****
--- 45,49 ----
  					<td><!-- TMPL_VAR NAME="quantity" --></td>
  					<td><!-- TMPL_VAR NAME="line_total" --></td>
+ 					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
  				</tr>
  			<!-- /TMPL_LOOP -->
***************
*** 49,65 ****
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="6" rowspan=3>
  					&nbsp;
  				</td>
! 				<td><b>SubTotal</b></td>
! 				<td><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="sub_total" --></td>
  			</tr>
  			<tr>
! 				<td><b>GST</b></td>
! 				<td><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="gist" --></td>
  			</tr>
  			<tr>
! 				<td><b>TOTAL</b></td>
! 				<td><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="grand_total" --></td>
  			</tr>
  		</table>
--- 51,67 ----
  			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->">
  			<tr>
! 				<td colspan="7" rowspan=3>
  					&nbsp;
  				</td>
! 				<th class="acquisition">SubTotal</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="sub_total" --></th>
  			</tr>
  			<tr>
! 				<th class="acquisition">GST</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="gist" --></th>
  			</tr>
  			<tr>
! 				<th class="acquisition">TOTAL</th>
! 				<th class="acquisition"><!-- TMPL_VAR NAME="currency" --><!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>