[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/acqui basket.tmpl,1.4,1.5

Owen Leonard oleonard at users.sourceforge.net
Wed Jun 8 19:03:52 CEST 2005 

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

Modified Files:
	basket.tmpl 
Log Message:
Synching with rel_2_2.

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/basket.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** basket.tmpl	2 May 2005 18:06:45 -0000	1.4
--- basket.tmpl	8 Jun 2005 17:03:49 -0000	1.5
***************
*** 18,21 ****
--- 18,22 ----
  		</div>
  	<!-- /TMPL_UNLESS -->
+ 	
  	<div class="data">
  	<!-- TMPL_IF name="books_loop" -->
***************
*** 25,39 ****
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
- 				<th scope="col">ISBN</th>
  				<th scope="col">Title</th>
! 				<th scope="col">Author</th>
! 				<th scope="col">rrp</th>
! 				<th scope="col">est</th>
! 				<th scope="col">Qty</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
--- 26,40 ----
  				<th scope="col">Order</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=biblioitems.publishercode">Publisher</a></th>
  				<th scope="col">Title</th>
! 				<th scope="col">RRP</th>
! 				<th scope="col">Est.</th>
! 				<th scope="col">Qty.</th>
  				<th scope="col">Total</th>
  				<th scope="col"><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&amp;order=aqorderbreakdown.bookfundid,biblioitems.publishercode">Fund</a></th>
+ <!-- TMPL_IF name="active" -->
  <!-- TMPL_UNLESS name="closedate" -->
  					<th scope="col">Remove</th>
  				<!-- /TMPL_UNLESS -->
+ 					<!-- /TMPL_IF -->
  			</tr>
  			<!-- TMPL_LOOP NAME="books_loop" -->
***************
*** 41,47 ****
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! 					<td><!-- TMPL_VAR NAME="isbn" --></td>
! 					<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></td>
! 					<td><!-- TMPL_VAR NAME="author" --></td>
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
--- 42,63 ----
  							<td><!-- TMPL_VAR NAME="ordernumber" --></td>
  					<td><!-- TMPL_VAR NAME="publishercode" --></td>
! <!-- TMPL_IF name="closedate" -->
! 						<td><p>
! 							<b><!-- TMPL_VAR NAME="title" --></b><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- TMPL_ELSE -->
! 						<td>
! 							<p>
! 							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
! 								<!-- TMPL_VAR NAME="author" -->
! 								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
! 								<!-- TMPL_IF name="notes" --></p><p><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
! 							</p>
! 						</td>
! 					<!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="rrp" --></td>
  					<td><!-- TMPL_VAR NAME="ecost" --></td>
***************
*** 49,52 ****
--- 65,69 ----
  					<td><!-- TMPL_VAR NAME="line_total" --></td>
  					<td><!-- TMPL_VAR NAME="bookfundid" --></td>
+ 					<!-- TMPL_IF name="active" -->
  					<!-- TMPL_UNLESS name="closedate" -->
  					<td>
***************
*** 54,75 ****
  						</td>
  					<!-- /TMPL_UNLESS -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="4" rowspan="3">
! 					&nbsp;<input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" />
! 			<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />
! 				</td>
! 				<th colspan="2">SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="sub_total" --></th><td rowspan="3" colspan="4">&nbsp;</td>
  			</tr>
  			<tr>
! 				<th colspan="2">GST</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="gist" --></th>
  			</tr>
  			<tr>
! 				<th colspan="2">TOTAL</th>
! 				<th><!-- TMPL_VAR NAME="currency" --> <!-- TMPL_VAR NAME="grand_total" --></th>
  			</tr>
  		</table>
--- 71,99 ----
  						</td>
  					<!-- /TMPL_UNLESS -->
+ 						<!-- /TMPL_IF -->
  				</tr>
  			<!-- /TMPL_LOOP -->
  			
  			<tr>
! 				<td colspan="2" rowspan="3">
! <input type="hidden" name="number" value="<!-- TMPL_VAR NAME="count" -->" /><input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" />	</td>
! 				<th>SubTotal</th>
! 				<th><!-- TMPL_VAR NAME="sub_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="sub_total" --></td>
! 				<th><!-- TMPL_VAR name="qty_total" --></th>
! 				<td colspan="2" rowspan="3">&nbsp;</td>
! 				
  			</tr>
  			<tr>
! 				<th>GST</th>
! 				<th><!-- TMPL_VAR NAME="gist_est" --></th>
! 				<th><!-- TMPL_VAR NAME="gist" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  			<tr>
! 				<th>TOTAL  (<!-- TMPL_VAR NAME="currency" -->)</th>
! 				<th><!-- TMPL_VAR NAME="grand_total_est" --></th>
! 				<th><!-- TMPL_VAR NAME="grand_total" --></th>
! 				<th>&nbsp;</th>
  			</tr>
  		</table>

More information about the Koha-cvs mailing list