[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acqui-home.tmpl,1.5,1.6 acquire.tmpl,1.6,1.7 basket.tmpl,1.6,1.7 newbasket2.tmpl,1.6,1.7 newbasket.tmpl,1.2,1.3 newbiblio.tmpl,1.7,1.8 order.tmpl,1.10,1.11 recieveorder.tmpl,1.5,1.6 recieve.tmpl,1.5,1.6 supplier.tmpl,1.7,1.8

Paul POULAIN tipaul at users.sourceforge.net
Tue Dec 9 11:29:12 CET 2003


Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui
In directory sc8-pr-cvs1:/tmp/cvs-serv27815/koha-tmpl/intranet-tmpl/default/en/acqui

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl 
	newbasket.tmpl newbiblio.tmpl order.tmpl recieveorder.tmpl 
	recieve.tmpl supplier.tmpl 
Log Message:
templates modified : ALL <TMPL_* XX> have been replaced by <!-- TMPL_* XX -->, because it's strict html compliant, and HTML::TreeBuilder deals better with this form.

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** acqui-home.tmpl	8 May 2003 14:23:48 -0000	1.5
--- acqui-home.tmpl	9 Dec 2003 10:29:07 -0000	1.6
***************
*** 1,3 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
  <h1>Acquisitions</h1><br>
--- 1,3 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
  <h1>Acquisitions</h1><br>
***************
*** 43,56 ****
  		<TD  bgcolor="ffdf61" colspan=2><b>EXCHANGE RATES </b></TD>
  	</TR>
! 	<TMPL_LOOP name="loop_currency">
  		<TR VALIGN=TOP>
  			<TD>
! 				<TMPL_VAR name="currency">
  			</td>
  			<td>
! 				<INPUT TYPE="text"  SIZE="10"   NAME="<TMPL_VAR name="currency">" value=<TMPL_VAR name="rate">>
  			</td>
  		</TR>
! 	</TMPL_LOOP>
  	<tr>
  		<td colspan=2 align="center"><input type=submit value="Save"></TD>
--- 43,56 ----
  		<TD  bgcolor="ffdf61" colspan=2><b>EXCHANGE RATES </b></TD>
  	</TR>
! 	<!-- TMPL_LOOP name="loop_currency" -->
  		<TR VALIGN=TOP>
  			<TD>
! 				<!-- TMPL_VAR name="currency" -->
  			</td>
  			<td>
! 				<INPUT TYPE="text"  SIZE="10"   NAME="<!-- TMPL_VAR name="currency" -->" value=<!-- TMPL_VAR name="rate" -->>
  			</td>
  		</TR>
! 	<!-- /TMPL_LOOP -->
  	<tr>
  		<td colspan=2 align="center"><input type=submit value="Save"></TD>
***************
*** 75,93 ****
  				<TD><b>Avail</B></TD>
  			</TR>
! 			<TMPL_LOOP name="loop_budget">
  				<tr>
! 					<td><TMPL_VAR name="bookfundname"></TD>
! 					<TD align=right><TMPL_VAR name="budgetamount"></TD>
! 					<TD align=right><TMPL_VAR name="spent"></TD>
! 					<TD align=right><TMPL_VAR name="comtd"></TD>
! 					<TD align=right><TMPL_VAR name="avail"></TD>
  				</TR>
! 			</TMPL_LOOP>
  			<tr>
  				<td><b>Total</b></TD>
! 				<TD align=right><b><TMPL_VAR name="total"></b></TD>
! 				<TD align=right><b><TMPL_VAR name="totspent"></b></TD>
! 				<TD align=right><b><TMPL_VAR name="totcomtd"></b></TD>
! 				<TD align=right><b><TMPL_VAR name="totavail"></b></TD>
  			</TR>
  		</table><br>
--- 75,93 ----
  				<TD><b>Avail</B></TD>
  			</TR>
! 			<!-- TMPL_LOOP name="loop_budget" -->
  				<tr>
! 					<td><!-- TMPL_VAR name="bookfundname" --></TD>
! 					<TD align=right><!-- TMPL_VAR name="budgetamount" --></TD>
! 					<TD align=right><!-- TMPL_VAR name="spent" --></TD>
! 					<TD align=right><!-- TMPL_VAR name="comtd" --></TD>
! 					<TD align=right><!-- TMPL_VAR name="avail" --></TD>
  				</TR>
! 			<!-- /TMPL_LOOP -->
  			<tr>
  				<td><b>Total</b></TD>
! 				<TD align=right><b><!-- TMPL_VAR name="total" --></b></TD>
! 				<TD align=right><b><!-- TMPL_VAR name="totspent" --></b></TD>
! 				<TD align=right><b><!-- TMPL_VAR name="totcomtd" --></b></TD>
! 				<TD align=right><b><!-- TMPL_VAR name="totavail" --></b></TD>
  			</TR>
  		</table><br>
***************
*** 112,114 ****
  </table>
  
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 112,114 ----
  </table>
  
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** acquire.tmpl	26 Apr 2003 04:41:15 -0000	1.6
--- acquire.tmpl	9 Dec 2003 10:29:08 -0000	1.7
***************
*** 1,14 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
  <div align=right>
! Invoice: <TMPL_VAR name="invoice"><br>
! Received By: <TMPL_VAR name="user"><br>
! <TMPL_VAR name="date">
  </div>
! <h1>Receipt Summary for: <TMPL_VAR name="name"> Invoice, <TMPL_VAR name="invoice"></h1>
  <CENTER>
  
  
! <TMPL_IF name="count">
  	<script language="javascript" type="text/javascript">
  	<!--
--- 1,14 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
  <div align=right>
! Invoice: <!-- TMPL_VAR name="invoice" --><br>
! Received By: <!-- TMPL_VAR name="user" --><br>
! <!-- TMPL_VAR name="date" -->
  </div>
! <h1>Receipt Summary for: <!-- TMPL_VAR name="name" --> Invoice, <!-- TMPL_VAR name="invoice" --></h1>
  <CENTER>
  
  
! <!-- TMPL_IF name="count" -->
  	<script language="javascript" type="text/javascript">
  	<!--
***************
*** 25,36 ****
  	</script>
  	<form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
! 	<h1><TMPL_VAR name="ordernumber"> - Receive Order</h1><br>
! 	Shopping Basket For: <TMPL_VAR name="name">
! 	<br> Order placed: <TMPL_VAR name="date">
  	<P>
  	<CENTER>
  	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
  		<tr valign=top bgcolor=#99cc33>
! 			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2>
  				<B>CATALOGUE DETAILS</B>
  			</td>
--- 25,36 ----
  	</script>
  	<form action="/cgi-bin/koha/acqui/finishreceive.pl" method=post>
! 	<h1><!-- TMPL_VAR name="ordernumber" --> - Receive Order</h1><br>
! 	Shopping Basket For: <!-- TMPL_VAR name="name" -->
! 	<br> Order placed: <!-- TMPL_VAR name="date" -->
  	<P>
  	<CENTER>
  	<TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
  		<tr valign=top bgcolor=#99cc33>
! 			<td background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2>
  				<B>CATALOGUE DETAILS</B>
  			</td>
***************
*** 38,73 ****
  		<TR VALIGN=TOP>
  			<TD><b>Title *</b></td>
! 			<td><input type=text size=20 name=title value="<TMPL_VAR name="title">" >
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Author</td>
! 			<td><input type=text size=20 name=author value="<TMPL_VAR name="author">" >
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Copyright Date</td>
! 			<td><input type=text size=20 name=copyright value="<TMPL_VAR name="copyrightdate">" >
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Format</td>
! 			<td><TMPL_VAR name="CGIitemtype"></td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>ISBN</td>
! 			<td><input type=text size=20 name=ISBN value="<TMPL_VAR name="isbn">"></td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Series</td>
! 			<td><input type=text size=20 name=Series value="<TMPL_VAR name="seriestitle">"></td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Branch</td>
! 			<td><TMPL_VAR name="CGIbranch"></td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc >
  			<TD><B>Item Barcode *</B></td>
! 			<td><input type=text size=20 name=barcode value="<TMPL_VAR name="barcode">"></td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc >
--- 38,73 ----
  		<TR VALIGN=TOP>
  			<TD><b>Title *</b></td>
! 			<td><input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->" >
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Author</td>
! 			<td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" >
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Copyright Date</td>
! 			<td><input type=text size=20 name=copyright value="<!-- TMPL_VAR name="copyrightdate" -->" >
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Format</td>
! 			<td><!-- TMPL_VAR name="CGIitemtype" --></td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>ISBN</td>
! 			<td><input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->"></td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Series</td>
! 			<td><input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->"></td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Branch</td>
! 			<td><!-- TMPL_VAR name="CGIbranch" --></td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc >
  			<TD><B>Item Barcode *</B></td>
! 			<td><input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->"></td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc >
***************
*** 77,91 ****
  		<TR VALIGN=TOP>
  			<td colspan=2 align="center">
! 				<input type=hidden name=biblio value=<TMPL_VAR name="biblionumber">>
! 				<input type=hidden name=ordnum value=<TMPL_VAR name="ordernumber">>
! 				<input type=hidden name=biblioitemnum value=<TMPL_VAR name="biblioitemnumber">>
! 				<input type=hidden name=id value="<TMPL_VAR name="booksellerid">">
! 				<input type=hidden name=freight value="<TMPL_VAR name="freight">">
! 				<input type=hidden name=gst value="<TMPL_VAR name="gst">">
! 				<TMPL_IF name="catview">
! 					<input type=image  name=submit src="/<TMPL_VAR name="theme">/images/filesave.png" border=0 title="continue" alt="save" border=0 border=0>
! 				<TMPL_ELSE>
! 					<a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">><img src="/<TMPL_VAR name="theme">/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0></a>
! 				</TMPL_IF>
  			</td>
  		</tr>
--- 77,91 ----
  		<TR VALIGN=TOP>
  			<td colspan=2 align="center">
! 				<input type=hidden name=biblio value=<!-- TMPL_VAR name="biblionumber" -->>
! 				<input type=hidden name=ordnum value=<!-- TMPL_VAR name="ordernumber" -->>
! 				<input type=hidden name=biblioitemnum value=<!-- TMPL_VAR name="biblioitemnumber" -->>
! 				<input type=hidden name=id value="<!-- TMPL_VAR name="booksellerid" -->">
! 				<input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
! 				<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
! 				<!-- TMPL_IF name="catview" -->
! 					<input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="continue" alt="save" border=0 border=0>
! 				<!-- TMPL_ELSE -->
! 					<a href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->><img src="/<!-- TMPL_VAR name="theme" -->/images/fileopen.png" border=0 title="edit" alt="edit" border=0 border=0></a>
! 				<!-- /TMPL_IF -->
  			</td>
  		</tr>
***************
*** 97,134 ****
  		<TR VALIGN=TOP>
  			<TD><B>Bookfund *</B></td>
! 			<td><TMPL_VAR name="CGIbookfund">
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Quantity Ordered</td>
! 			<td><input type=text size=20 name=quantity value="<TMPL_VAR name="quantity">">
  			</td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc>
  			<TD><B>Quantity Received *</B></td>
! 			<td><input type=text size=20 name=quantityrec value="<TMPL_VAR name="quantityreceived">">
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Replacement Cost</td>
! 			<td><input type=text size=20 name=rrp value="<TMPL_VAR name="rrp">">
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Budgeted Cost </td>
! 			<td><input type=text size=20 name=ecost value="<TMPL_VAR name="ecost">"></td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc>
  			<TD><B>Actual Cost *</B></td>
! 			<td><input type=text size=20 name=cost value="<TMPL_VAR name="unitprice">"></td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc>
  			<TD>Invoice Number</td>
  			<td>
! 				<TMPL_VAR name="invoice">
! 				<input type=hidden name=invoice value="<TMPL_VAR name="invoice">">
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Notes</td>
! 			<td><input type=text size=20 name=notes value="<TMPL_VAR name="notes">"></td>
  		</tr>
  	</table>
--- 97,134 ----
  		<TR VALIGN=TOP>
  			<TD><B>Bookfund *</B></td>
! 			<td><!-- TMPL_VAR name="CGIbookfund" -->
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Quantity Ordered</td>
! 			<td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->">
  			</td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc>
  			<TD><B>Quantity Received *</B></td>
! 			<td><input type=text size=20 name=quantityrec value="<!-- TMPL_VAR name="quantityreceived" -->">
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Replacement Cost</td>
! 			<td><input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->">
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Budgeted Cost </td>
! 			<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->"></td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc>
  			<TD><B>Actual Cost *</B></td>
! 			<td><input type=text size=20 name=cost value="<!-- TMPL_VAR name="unitprice" -->"></td>
  		</tr>
  		<TR VALIGN=TOP bgcolor=#ffffcc>
  			<TD>Invoice Number</td>
  			<td>
! 				<!-- TMPL_VAR name="invoice" -->
! 				<input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
  			</td>
  		</tr>
  		<TR VALIGN=TOP>
  			<TD>Notes</td>
! 			<td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
  		</tr>
  	</table>
***************
*** 137,141 ****
  	<br clear=all>
  	<p> &nbsp; </p>
! <TMPL_ELSE>
  	<br />
  	<center>
--- 137,141 ----
  	<br clear=all>
  	<p> &nbsp; </p>
! <!-- TMPL_ELSE -->
  	<br />
  	<center>
***************
*** 149,162 ****
  		<td><b>Recieved</b></td>
  	</tr>
! 	<TMPL_LOOP name="loop">
  		<tr>
! 			<TD><TMPL_VAR name="basketno"></td>
! 			<TD><TMPL_VAR name="isbn"></td>
! 			<td><a href=acquire.pl?recieve=<TMPL_VAR name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR name="invoice">&freight=<TMPL_VAR name="freight">&gst=<TMPL_VAR name="gst">&id=<TMPL_VAR name="id">><TMPL_VAR name="title"></a></td>
! 			<td><TMPL_VAR name="author"></td>
! 			<td><TMPL_VAR name="quantity"></td>
! 			<td><TMPL_VAR name="quantityrecieved"></td>
  		</tr>
! 	</TMPL_LOOP>
  	</table>
! </TMPL_IF>
--- 149,162 ----
  		<td><b>Recieved</b></td>
  	</tr>
! 	<!-- TMPL_LOOP name="loop" -->
  		<tr>
! 			<TD><!-- TMPL_VAR name="basketno" --></td>
! 			<TD><!-- TMPL_VAR name="isbn" --></td>
! 			<td><a href=acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&freight=<!-- TMPL_VAR name="freight" -->&gst=<!-- TMPL_VAR name="gst" -->&id=<!-- TMPL_VAR name="id" -->><!-- TMPL_VAR name="title" --></a></td>
! 			<td><!-- TMPL_VAR name="author" --></td>
! 			<td><!-- TMPL_VAR name="quantity" --></td>
! 			<td><!-- TMPL_VAR name="quantityrecieved" --></td>
  		</tr>
! 	<!-- /TMPL_LOOP -->
  	</table>
! <!-- /TMPL_IF -->

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** basket.tmpl	24 Jun 2003 09:02:15 -0000	1.6
--- basket.tmpl	9 Dec 2003 10:29:08 -0000	1.7
***************
*** 1,6 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
! <h1>Shopping Basket <TMPL_VAR name="basket"> for <a href=supplier.pl?id=<TMPL_VAR name="booksellerid">></a> <TMPL_VAR name="name"></h1><br />
! (Our Reference: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, authorised by: <TMPL_VAR name="loggedinusername">)<br />
  <CENTER>
  <p>
--- 1,6 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
! <h1>Shopping Basket <!-- TMPL_VAR name="basket" --> for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
! (Our Reference: <!-- TMPL_VAR name="entrydate" -->, #<!-- TMPL_VAR name="basket" -->, authorised by: <!-- TMPL_VAR name="loggedinusername" -->)<br />
  <CENTER>
  <p>
***************
*** 16,33 ****
  		<td width="8%"><b>Total</b></td>
  	</tr>
! 	<TMPL_LOOP name="books_loop">
! 		<tr valign=top bgcolor="<TMPL_VAR name="color">">
! 			<td><TMPL_VAR name="ordernumber"></td>
! 			<td><TMPL_VAR name="isbn"></td>
! 			<td><a href="newbiblio.pl?ordnum=<TMPL_VAR name="ordernumber">&id=<TMPL_VAR name="booksellerid">&basket=<TMPL_VAR name="basket">"><TMPL_VAR name="title"></a></td>
! 			<td><TMPL_VAR name="author"></td>
! 			<td><TMPL_VAR name="rrp"></td>
! 			<td><TMPL_VAR name="ecost"></td>
! 			<td><TMPL_VAR name="quantity"></td>
! 			<td><TMPL_VAR name="line_total"></td>
  		</tr>
! 	</TMPL_LOOP>
! 	<input type=hidden name=number value=<TMPL_VAR name="count">>
! 	<input type=hidden name=basketno value="<TMPL_VAR name="basket">">
  	<tr valign=top bgcolor=white>
  		<td colspan=6 rowspan=3  bgcolor="#ffdf61">
--- 16,33 ----
  		<td width="8%"><b>Total</b></td>
  	</tr>
! 	<!-- TMPL_LOOP name="books_loop" -->
! 		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
! 			<td><!-- TMPL_VAR name="ordernumber" --></td>
! 			<td><!-- TMPL_VAR name="isbn" --></td>
! 			<td><a href="newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->&basket=<!-- TMPL_VAR name="basket" -->"><!-- TMPL_VAR name="title" --></a></td>
! 			<td><!-- TMPL_VAR name="author" --></td>
! 			<td><!-- TMPL_VAR name="rrp" --></td>
! 			<td><!-- TMPL_VAR name="ecost" --></td>
! 			<td><!-- TMPL_VAR name="quantity" --></td>
! 			<td><!-- TMPL_VAR name="line_total" --></td>
  		</tr>
! 	<!-- /TMPL_LOOP -->
! 	<input type=hidden name=number value=<!-- TMPL_VAR name="count" -->>
! 	<input type=hidden name=basketno value="<!-- TMPL_VAR name="basket" -->">
  	<tr valign=top bgcolor=white>
  		<td colspan=6 rowspan=3  bgcolor="#ffdf61">
***************
*** 36,54 ****
  		</td>
    		<td><b>SubTotal</b></td>
!   		<td><TMPL_VAR name="currency"><TMPL_VAR name="sub_total"></td>
  	</tr>
  	<tr valign=top bgcolor=white>
  		<td><b>GST</b></td>
! 		<td><TMPL_VAR name="currency"><TMPL_VAR name="gist"></td>
  	</tr>
  	<tr valign=top bgcolor=white>
  		<td><b>TOTAL</b></td>
! 		<td><TMPL_VAR name="currency"><TMPL_VAR name="grand_total"></td>
  	</tr>
  	<tr valign=top bgcolor=white>
  		<td colspan=9>
  			<FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
! 				<input type=hidden name=id value="<TMPL_VAR name="id">">
! 				<input type=hidden name=basket value="<TMPL_VAR name="basket">">
  				<b> Add order : enter keyword or title: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
  			</form>
--- 36,54 ----
  		</td>
    		<td><b>SubTotal</b></td>
!   		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
  	</tr>
  	<tr valign=top bgcolor=white>
  		<td><b>GST</b></td>
! 		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
  	</tr>
  	<tr valign=top bgcolor=white>
  		<td><b>TOTAL</b></td>
! 		<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="grand_total" --></td>
  	</tr>
  	<tr valign=top bgcolor=white>
  		<td colspan=9>
  			<FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
! 				<input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
! 				<input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
  				<b> Add order : enter keyword or title: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
  			</form>
***************
*** 59,61 ****
  </CENTER>
  
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 59,61 ----
  </CENTER>
  
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** newbasket2.tmpl	11 Apr 2003 08:42:37 -0000	1.6
--- newbasket2.tmpl	9 Dec 2003 10:29:08 -0000	1.7
***************
*** 1,19 ****
! <TMPL_INCLUDE NAME="acquisitions-top.inc">
  
!  <H1>Shopping Basket For: <TMPL_VAR name="bookselname"></H1>
  
! <TMPL_IF name ="testdonation">
! 	<a href="newbiblio.pl?id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&sub=<TMPL_VAR name="parsub">">
! 	<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png" border=0 align=right alt="Add New Biblio"></a>
! <TMPL_ELSE>
! 	<a href="newdonation.pl?id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&sub=<TMPL_VAR name="parsub">">
! 	<img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/filenew.png"  border=0 align=right alt="Add New Biblio"></a>
! </TMPL_IF>
  
! <a href="basket.pl?basket=<TMPL_VAR name="basket">">
! <img src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/1uparrow.png"  border=0 align=right alt="View Basket"></a>
  <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl">
! <input type=hidden name=id value=<TMPL_VAR name="id">>
! <input type=hidden name=basket value=<TMPL_VAR name="basket">>
  <b>New Search: </b><INPUT TYPE="text"  SIZE="25"   NAME="search"></form>
  <br clear=all>
--- 1,19 ----
! <!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
  
!  <H1>Shopping Basket For: <!-- TMPL_VAR name="bookselname" --></H1>
  
! <!-- TMPL_IF name ="testdonation" -->
! 	<a href="newbiblio.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
! 	<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png" border=0 align=right alt="Add New Biblio"></a>
! <!-- TMPL_ELSE -->
! 	<a href="newdonation.pl?id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&sub=<!-- TMPL_VAR name="parsub" -->">
! 	<img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filenew.png"  border=0 align=right alt="Add New Biblio"></a>
! <!-- /TMPL_IF -->
  
! <a href="basket.pl?basket=<!-- TMPL_VAR name="basket" -->">
! <img src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/1uparrow.png"  border=0 align=right alt="View Basket"></a>
  <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl">
! <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
! <input type=hidden name=basket value=<!-- TMPL_VAR name="basket" -->>
  <b>New Search: </b><INPUT TYPE="text"  SIZE="25"   NAME="search"></form>
  <br clear=all>
***************
*** 23,34 ****
  You searched on
  <B>
! <TMPL_LOOP name="loopsearch">
! 	<TMPL_VAR name="key"> <TMPL_VAR name="value">
! </TMPL_LOOP>
  </B>
  <BR>
! <TMPL_VAR name="count">  results found.
  
! <br> Results <TMPL_VAR name="dispnum"> to <TMPL_VAR name="offset2"> displayed.
  
  <TABLE  CELLSPACING=0  CELLPADDING=6 border=0>
--- 23,34 ----
  You searched on
  <B>
! <!-- TMPL_LOOP name="loopsearch" -->
! 	<!-- TMPL_VAR name="key" --> <!-- TMPL_VAR name="value" -->
! <!-- /TMPL_LOOP -->
  </B>
  <BR>
! <!-- TMPL_VAR name="count" -->  results found.
  
! <br> Results <!-- TMPL_VAR name="dispnum" --> to <!-- TMPL_VAR name="offset2" --> displayed.
  
  <TABLE  CELLSPACING=0  CELLPADDING=6 border=0>
***************
*** 41,74 ****
  	</TR>
  
! <TMPL_LOOP name="loopresult">
! 	<TR VALIGN=TOP bgcolor="<TMPL_VAR name="toggle">">
  		<TD>
! 			<TMPL_IF name="testdonation">
! 				<A HREF="/cgi-bin/koha/acqui/newbiblio.pl?sub=<TMPL_VAR name="sub">&author=<TMPL_VAR name="author2">&copyright=<TMPL_VAR name="copyright">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&biblio=<TMPL_VAR name="biblionumber">&title=<TMPL_VAR name="title2">">
! 				<TMPL_VAR name="title">
  				</A>
! 			<TMPL_ELSE>
! 				<A HREF="/cgi-bin/koha/acqui/newdonation.pl?author=<TMPL_VAR name="author2">&copyright=<TMPL_VAR name="copyright">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&biblio=<TMPL_VAR name="biblionumber">&title=<TMPL_VAR name="title2">">
! 				<TMPL_VAR name="title">
  				</A>
! 			</TMPL_IF>
  		</TD>
  		<TD>
! 			<A HREF="/cgi-bin/koha/search.pl?author=<TMPL_VAR name="word">&type=<TMPL_VAR name="type">">
! 			<TMPL_VAR name="author">
  			</A>
  		</TD>
  		<TD>
! 			<TMPL_VAR name="copyright">
  		</TD>
  		<TD>
! 			<TMPL_VAR name="itemcount">
  		</TD>
  		<TD>
! 			<TMPL_VAR name="location">
  		</TD>
  	</TR>
  
! </TMPL_LOOP>
  
  	<TR VALIGN=TOP bgcolor="#ffdf61">
--- 41,74 ----
  	</TR>
  
! <!-- TMPL_LOOP name="loopresult" -->
! 	<TR VALIGN=TOP bgcolor="<!-- TMPL_VAR name="toggle" -->">
  		<TD>
! 			<!-- TMPL_IF name="testdonation" -->
! 				<A HREF="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR name="sub" -->&author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
! 				<!-- TMPL_VAR name="title" -->
  				</A>
! 			<!-- TMPL_ELSE -->
! 				<A HREF="/cgi-bin/koha/acqui/newdonation.pl?author=<!-- TMPL_VAR name="author2" -->&copyright=<!-- TMPL_VAR name="copyright" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&title=<!-- TMPL_VAR name="title2" -->">
! 				<!-- TMPL_VAR name="title" -->
  				</A>
! 			<!-- /TMPL_IF -->
  		</TD>
  		<TD>
! 			<A HREF="/cgi-bin/koha/search.pl?author=<!-- TMPL_VAR name="word" -->&type=<!-- TMPL_VAR name="type" -->">
! 			<!-- TMPL_VAR name="author" -->
  			</A>
  		</TD>
  		<TD>
! 			<!-- TMPL_VAR name="copyright" -->
  		</TD>
  		<TD>
! 			<!-- TMPL_VAR name="itemcount" -->
  		</TD>
  		<TD>
! 			<!-- TMPL_VAR name="location" -->
  		</TD>
  	</TR>
  
! <!-- /TMPL_LOOP -->
  
  	<TR VALIGN=TOP bgcolor="#ffdf61">
***************
*** 91,100 ****
  </TABLE>
  
! <TMPL_IF name="offsetover">
! <A HREF="/cgi-bin/koha/acqui/newbasket2.pl?num=<TMPL_VAR name="num">&offset=<TMPL_VAR name="offset">&type=<TMPL_VAR name="type">&id=<TMPL_VAR name="id">&basket=<TMPL_VAR name="basket">&search=<TMPL_VAR name="title">&author=<TMPL_VAR name="author">">
  Next
  </A>
! </TMPL_IF>
  </CENTER>
  
! <TMPL_INCLUDE NAME="acquisitions-bottom.inc">
--- 91,100 ----
  </TABLE>
  
! <!-- TMPL_IF name="offsetover" -->
! <A HREF="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR name="num" -->&offset=<!-- TMPL_VAR name="offset" -->&type=<!-- TMPL_VAR name="type" -->&id=<!-- TMPL_VAR name="id" -->&basket=<!-- TMPL_VAR name="basket" -->&search=<!-- TMPL_VAR name="title" -->&author=<!-- TMPL_VAR name="author" -->">
  Next
  </A>
! <!-- /TMPL_IF -->
  </CENTER>
  
! <!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: newbasket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** newbasket.tmpl	26 Apr 2003 04:41:15 -0000	1.2
--- newbasket.tmpl	9 Dec 2003 10:29:08 -0000	1.3
***************
*** 1,13 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
! <h1>Shopping Basket <TMPL_VAR name="basket"> for <TMPL_VAR name="name"></h1><br />
! (Our Reference: <TMPL_VAR name="entrydate">, #<TMPL_VAR name="basket">, authorised by: <TMPL_VAR name="user">)<br />
! Ph: <TMPL_VAR name="phone">, Fax: <TMPL_VAR name="fax"><br />
! <TMPL_VAR name="address1">, <TMPL_VAR name="address2"><br />
! <TMPL_VAR name="address3">, <TMPL_VAR name="address4"><br />
  <p>
  <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
! <input type=hidden name=id value="<TMPL_VAR name="id">">
! <input type=hidden name=basket value="<TMPL_VAR name="basket">">
  <b> Search Keyword or Title: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
  
--- 1,13 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
! <h1>Shopping Basket <!-- TMPL_VAR name="basket" --> for <!-- TMPL_VAR name="name" --></h1><br />
! (Our Reference: <!-- TMPL_VAR name="entrydate" -->, #<!-- TMPL_VAR name="basket" -->, authorised by: <!-- TMPL_VAR name="user" -->)<br />
! Ph: <!-- TMPL_VAR name="phone" -->, Fax: <!-- TMPL_VAR name="fax" --><br />
! <!-- TMPL_VAR name="address1" -->, <!-- TMPL_VAR name="address2" --><br />
! <!-- TMPL_VAR name="address3" -->, <!-- TMPL_VAR name="address4" --><br />
  <p>
  <FORM ACTION="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
! <input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
! <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
  <b> Search Keyword or Title: </b><INPUT TYPE="text"  SIZE="25"   NAME="search">
  
***************
*** 22,36 ****
  		<td width="8%"><b>Qty</b></td>
  	</tr>
! 	<TMPL_LOOP name="books_loop">
! 		<tr valign=top bgcolor=<TMPL_VAR name="color">>
! 			<td><TMPL_VAR name="ordernumber"></td>
! 			<td><TMPL_VAR name="isbn"></td>
! 			<td><TMPL_VAR name="title"></td>
! 			<td><TMPL_VAR name="author"></td>
! 			<td><TMPL_VAR name="quantity"></td>
  		</tr>
! 	</TMPL_LOOP>
  </table>
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
  
  
--- 22,36 ----
  		<td width="8%"><b>Qty</b></td>
  	</tr>
! 	<!-- TMPL_LOOP name="books_loop" -->
! 		<tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
! 			<td><!-- TMPL_VAR name="ordernumber" --></td>
! 			<td><!-- TMPL_VAR name="isbn" --></td>
! 			<td><!-- TMPL_VAR name="title" --></td>
! 			<td><!-- TMPL_VAR name="author" --></td>
! 			<td><!-- TMPL_VAR name="quantity" --></td>
  		</tr>
! 	<!-- /TMPL_LOOP -->
  </table>
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
  
  

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** newbiblio.tmpl	10 Aug 2003 01:10:35 -0000	1.7
--- newbiblio.tmpl	9 Dec 2003 10:29:08 -0000	1.8
***************
*** 1,3 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  <script language="javascript" type="text/javascript">
  
--- 1,3 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <script language="javascript" type="text/javascript">
  
***************
*** 23,28 ****
    GST=0;
    if (gst_on){
!     rrp=rrp*(1+<TMPL_VAR name="gstrate">);
!     GST=ecost*(<TMPL_VAR name="gstrate">);
    }
  
--- 23,28 ----
    GST=0;
    if (gst_on){
!     rrp=rrp*(1+<!-- TMPL_VAR name="gstrate" -->);
!     GST=ecost*(<!-- TMPL_VAR name="gstrate" -->);
    }
  
***************
*** 51,73 ****
  </script>
  <form action=/cgi-bin/koha/acqui/addorder.pl method=post name=frusin>
! <TMPL_UNLESS name="existing"><input type=hidden name=existing value=no></TMPL_UNLESS>
! <!-- <TMPL_VAR name="title"> -->
! <input type=hidden name=ordnum value="<TMPL_VAR name="ordnum">">
! <input type=hidden name=basket value="<TMPL_VAR name="basket">">
! <input type=hidden name=supplier value="<TMPL_VAR name="id">">
! <input type=hidden name=biblio value="<TMPL_VAR name="biblio">">
! <input type=hidden name=bibitemnum value="<TMPL_VAR name="biblioitemnumber">">
! <input type=hidden name=oldtype value="<TMPL_VAR name="itemtype">">
! <input type=hidden name=discount value="<TMPL_VAR name="discount">">
! <input type=hidden name=listinc value="<TMPL_VAR name="listincgst">">
! <input type=hidden name=currency value="<TMPL_VAR name="currency">">
! <input type=hidden name=applygst value="<TMPL_VAR name="gstreg">">
! <TMPL_LOOP name="loop_currencies">
! 	<input type=hidden name="<TMPL_VAR name="currency">" value="<TMPL_VAR name="rate">">
! </TMPL_LOOP>
! <TMPL_IF name="orderexists"><input type=hidden name=orderexists value=yes></TMPL_IF>
! <a href="basket.pl?basket=<TMPL_VAR name=basket>"><img src="<TMPL_VAR name=themelang>/images/view-basket.gif" width=187 heigth=42 border=0 align=right alt="View Basket"></a>
! <h1><TMPL_VAR name="ordnum"> - Order Details </h1><br>
! Shopping Basket For: <TMPL_VAR name="name">
  <P>
  <CENTER>
--- 51,73 ----
  </script>
  <form action=/cgi-bin/koha/acqui/addorder.pl method=post name=frusin>
! <!-- TMPL_UNLESS name="existing" --><input type=hidden name=existing value=no><!-- /TMPL_UNLESS -->
! <!-- <!-- TMPL_VAR name="title" --> -->
! <input type=hidden name=ordnum value="<!-- TMPL_VAR name="ordnum" -->">
! <input type=hidden name=basket value="<!-- TMPL_VAR name="basket" -->">
! <input type=hidden name=supplier value="<!-- TMPL_VAR name="id" -->">
! <input type=hidden name=biblio value="<!-- TMPL_VAR name="biblio" -->">
! <input type=hidden name=bibitemnum value="<!-- TMPL_VAR name="biblioitemnumber" -->">
! <input type=hidden name=oldtype value="<!-- TMPL_VAR name="itemtype" -->">
! <input type=hidden name=discount value="<!-- TMPL_VAR name="discount" -->">
! <input type=hidden name=listinc value="<!-- TMPL_VAR name="listincgst" -->">
! <input type=hidden name=currency value="<!-- TMPL_VAR name="currency" -->">
! <input type=hidden name=applygst value="<!-- TMPL_VAR name="gstreg" -->">
! <!-- TMPL_LOOP name="loop_currencies" -->
! 	<input type=hidden name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->">
! <!-- /TMPL_LOOP -->
! <!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
! <a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->"><img src="<!-- TMPL_VAR name=themelang -->/images/view-basket.gif" width=187 heigth=42 border=0 align=right alt="View Basket"></a>
! <h1><!-- TMPL_VAR name="ordnum" --> - Order Details </h1><br>
! Shopping Basket For: <!-- TMPL_VAR name="name" -->
  <P>
  <CENTER>
***************
*** 78,131 ****
  	<TR VALIGN=TOP>
  		<TD><b>Title *</b></td>
! 		<td><input type=text size=20 name=title value="<TMPL_VAR name="title">"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Author</td>
! 		<td><input type=text size=20 name=author value="<TMPL_VAR name="author">" ></td>
  	</tr>
  	<TR VALIGN=TOP>
  	<TD>Copyright Date</td>
! 	<td><input type=text size=20 name=copyright value="<TMPL_VAR name="copyrightdate">">
  	</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Format</td>
! 		<td><TMPL_VAR name="CGIitemtype"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>ISBN</td>
! 		<td><input type=text size=20 name=ISBN value="<TMPL_VAR name="isbn">"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Series</td>
! 		<td><input type=text size=20 name=Series value="<TMPL_VAR name="seriestitle">"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Branch</td>
! 		<td><TMPL_VAR name="CGIbranch"></td>
  	</tr>
  </table>
! <img src="<TMPL_VAR name="themelang">/images/holder.gif" width=32 height=250 align=left>
  <table border=1 cellspacing=0 cellpadding=5 width="40%">
  	<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
  	<TR VALIGN=TOP>
  		<TD>Quantity</td>
! 		<td><input type=text size=20 name=quantity value="<TMPL_VAR name="quantity">" onchange='update(this.form)' ></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Bookfund</td>
! 		<td><TMPL_VAR name="CGIbookfund"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Suppliers List Price</td>
! 		<td><input type=text size=20 name=list_price value="<TMPL_VAR name="listprice">" onchange='update(this.form)'></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Replacement Cost <br><FONT SIZE=2></td>
! 		<td><input type=text size=20 name=rrp value="<TMPL_VAR name="rrp">" onchange='update(this.form)'>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Budgeted Cost<BR><FONT SIZE=2>(ex GST, inc discount)</FONT> </td>
! 		<td><input type=text size=20 name=ecost value="<TMPL_VAR name="ecost">" onchange='update(this.form)'></td>
  	</tr>
  	<TR VALIGN=TOP>
--- 78,131 ----
  	<TR VALIGN=TOP>
  		<TD><b>Title *</b></td>
! 		<td><input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Author</td>
! 		<td><input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" ></td>
  	</tr>
  	<TR VALIGN=TOP>
  	<TD>Copyright Date</td>
! 	<td><input type=text size=20 name=copyright value="<!-- TMPL_VAR name="copyrightdate" -->">
  	</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Format</td>
! 		<td><!-- TMPL_VAR name="CGIitemtype" --></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>ISBN</td>
! 		<td><input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Series</td>
! 		<td><input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Branch</td>
! 		<td><!-- TMPL_VAR name="CGIbranch" --></td>
  	</tr>
  </table>
! <img src="<!-- TMPL_VAR name="themelang" -->/images/holder.gif" width=32 height=250 align=left>
  <table border=1 cellspacing=0 cellpadding=5 width="40%">
  	<tr valign=top bgcolor=#99cc33><td background="/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
  	<TR VALIGN=TOP>
  		<TD>Quantity</td>
! 		<td><input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->" onchange='update(this.form)' ></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Bookfund</td>
! 		<td><!-- TMPL_VAR name="CGIbookfund" --></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Suppliers List Price</td>
! 		<td><input type=text size=20 name=list_price value="<!-- TMPL_VAR name="listprice" -->" onchange='update(this.form)'></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Replacement Cost <br><FONT SIZE=2></td>
! 		<td><input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->" onchange='update(this.form)'>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Budgeted Cost<BR><FONT SIZE=2>(ex GST, inc discount)</FONT> </td>
! 		<td><input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='update(this.form)'></td>
  	</tr>
  	<TR VALIGN=TOP>
***************
*** 146,153 ****
  	<TR VALIGN=TOP>
  		<TD>Notes</td>
! 		<td><input type=text size=20 name=notes value="<TMPL_VAR name="notes">"></td>
  	</tr>
  	<TR VALIGN=TOP>
! 		<TD colspan=2><input type=image  name=submit src="<TMPL_VAR name="interface">/<TMPL_VAR name="theme">/images/2rightarrow.png" border=0 align=right>	</td>
  	</tr>
  </table>
--- 146,153 ----
  	<TR VALIGN=TOP>
  		<TD>Notes</td>
! 		<td><input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->"></td>
  	</tr>
  	<TR VALIGN=TOP>
! 		<TD colspan=2><input type=image  name=submit src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" border=0 align=right>	</td>
  	</tr>
  </table>
***************
*** 162,166 ****
  </td></tr></table>
  <p> &nbsp; </p>
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
  
  
--- 162,166 ----
  </td></tr></table>
  <p> &nbsp; </p>
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
  
  

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** order.tmpl	18 Jul 2003 13:44:54 -0000	1.10
--- order.tmpl	9 Dec 2003 10:29:08 -0000	1.11
***************
*** 1,6 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  <h1>Supplier Search Results</h1><br />
  <CENTER>
! You searched on <b>supplier <TMPL_VAR name="supplier">,</b> <TMPL_VAR name="count"> results found<p>
  <table border=0 cellspacing=0 cellpadding=5 width="80%">
  <tr valign=top bgcolor="#ffdf61">
--- 1,6 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <h1>Supplier Search Results</h1><br />
  <CENTER>
! You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found<p>
  <table border=0 cellspacing=0 cellpadding=5 width="80%">
  <tr valign=top bgcolor="#ffdf61">
***************
*** 20,48 ****
  </tr>
  
! <TMPL_LOOP name="loop_suppliers">
! 	<tr valign=top bgcolor=<TMPL_VAR name="color">>
  		<td>
! 			<a href="basket.pl?id=<TMPL_VAR name=id>"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
  		</td>
  		<td>
! 			<a href="recieveorder.pl?id=<TMPL_VAR name=id>"><img src="<TMPL_VAR NAME='interface'>/<TMPL_VAR name="theme">/images/mail_get.png" title="receive" ALT="Add" BORDER=0 ></a>
  		</td>
! 		<td><a href="supplier.pl?id=<TMPL_VAR name=id>"><TMPL_VAR name="name"></a></td>
  		<td>
  			<table width="100%" cellspacing=0 cellpadding=5 border=0>
! 				<TMPL_LOOP name="loop_basket">
  					<tr>
! 						<td width="15%"><a href="/cgi-bin/koha/acqui/basket.pl?basket=<TMPL_VAR name="basketno">"><TMPL_VAR name="basketno"></a></td>
  						<td width="15%"><TMPl_VAR name="total"></td>
! 						<td width="40%"><TMPL_VAR name="authorisedby"></td>
! 						<td width="30%"><TMPL_VAR name="entrydate"></td>
  					</tr>
! 				</TMPL_LOOP>
  			</table>
  	</tr>
! </TMPL_LOOP>
  </table>
  </CENTER>
  <br>
  <a class="button" href="supplier.pl?id=0">Add supplier</a>
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 20,48 ----
  </tr>
  
! <!-- TMPL_LOOP name="loop_suppliers" -->
! 	<tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
  		<td>
! 			<a href="basket.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_send.png" title="Add order" ALT="Add" BORDER=0 ></a>
  		</td>
  		<td>
! 			<a href="recieveorder.pl?id=<!-- TMPL_VAR name=id -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/mail_get.png" title="receive" ALT="Add" BORDER=0 ></a>
  		</td>
! 		<td><a href="supplier.pl?id=<!-- TMPL_VAR name=id -->"><!-- TMPL_VAR name="name" --></a></td>
  		<td>
  			<table width="100%" cellspacing=0 cellpadding=5 border=0>
! 				<!-- TMPL_LOOP name="loop_basket" -->
  					<tr>
! 						<td width="15%"><a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR name="basketno" --></a></td>
  						<td width="15%"><TMPl_VAR name="total"></td>
! 						<td width="40%"><!-- TMPL_VAR name="authorisedby" --></td>
! 						<td width="30%"><!-- TMPL_VAR name="entrydate" --></td>
  					</tr>
! 				<!-- /TMPL_LOOP -->
  			</table>
  	</tr>
! <!-- /TMPL_LOOP -->
  </table>
  </CENTER>
  <br>
  <a class="button" href="supplier.pl?id=0">Add supplier</a>
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** recieveorder.tmpl	26 Apr 2003 04:41:15 -0000	1.5
--- recieveorder.tmpl	9 Dec 2003 10:29:08 -0000	1.6
***************
*** 1,9 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
! <h1>Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?id=<TMPL_VAR NAME="id">"><TMPL_VAR name="name"></a></h1>
  <p>
  <CENTER>
  <form method=get action="receive.pl">
! <input type=hidden name=id value=<TMPL_VAR name="id">>
  <p>
  <table border=1 cellspacing=0 cellpadding=5>
--- 1,9 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
! <h1>Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR name="name" --></a></h1>
  <p>
  <CENTER>
  <form method=get action="receive.pl">
! <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
  <p>
  <table border=1 cellspacing=0 cellpadding=5>
***************
*** 25,29 ****
  </tr>
  <TR VALIGN=TOP>
! <td colspan=2 align="center"><input type=image  name=submit src="/<TMPL_VAR name="theme">/images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
  </td>
  </tr>
--- 25,29 ----
  </tr>
  <TR VALIGN=TOP>
! <td colspan=2 align="center"><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/2rightarrow.png" border=0 title="continue" alt="save" border=0>
  </td>
  </tr>
***************
*** 31,33 ****
  </CENTER>
  
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 31,33 ----
  </CENTER>
  
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** recieve.tmpl	26 Apr 2003 04:41:15 -0000	1.5
--- recieve.tmpl	9 Dec 2003 10:29:08 -0000	1.6
***************
*** 1,17 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
  <div align=right>
! Invoice: <TMPL_VAR name="invoice"><br>
! Received By: <TMPL_VAR name="user"><br>
! <TMPL_VAR name="date">
  </div>
! <h1>Receipt Summary for : <TMPL_VAR name="name">, Invoice <TMPL_VAR name="invoice"></h1>
  <CENTER>
  
  <FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
! <input type=hidden name=id value="<TMPL_VAR name="id">">
! <input type=hidden name=gst value="<TMPL_VAR name="gst">">
! <input type=hidden name=freight value="<TMPL_VAR name="freight">">
! <input type=hidden name=invoice value="<TMPL_VAR name="invoice">">
  
  <b>Search ISBN or Title:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
--- 1,17 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
  <div align=right>
! Invoice: <!-- TMPL_VAR name="invoice" --><br>
! Received By: <!-- TMPL_VAR name="user" --><br>
! <!-- TMPL_VAR name="date" -->
  </div>
! <h1>Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --></h1>
  <CENTER>
  
  <FORM ACTION="/cgi-bin/koha/acqui/acquire.pl">
! <input type=hidden name=id value="<!-- TMPL_VAR name="id" -->">
! <input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
! <input type=hidden name=freight value="<!-- TMPL_VAR name="freight" -->">
! <input type=hidden name=invoice value="<!-- TMPL_VAR name="invoice" -->">
  
  <b>Search ISBN or Title:</b> <INPUT TYPE="text"  SIZE="25"   NAME="recieve">
***************
*** 31,47 ****
  		<td><b>TOTAL</b></td>
  	</tr>
! 	<TMPL_VAR name="count">
! 	<TMPL_LOOP name="loop_orders">
! 		<tr valign=top bgcolor="<TMPL_VAR name="color">">
! 			<td><TMPL_VAR name="basketno"></td>
! 			<td><TMPL_VAR name="isbn"></td>
! 			<td><a href="acquire.pl?recieve=<TMPL_VAR name="ordernumber">&biblio=<TMPL_VAR name="biblionumber">&invoice=<TMPL_VAR name="invoice">&gst=<TMPL_VAR name="gst">&freight=<TMPL_VAR name="freight">&id=<TMPL_VAR name="id">"><TMPL_VAR name="title"></a></td>
! 			<td><TMPL_VAR name="author"></td>
! 			<td>$<TMPL_VAR name="unitprice"></td>
  			<td></td>
! 			<td><TMPL_VAR name="quantityrecieved"></td>
! 			<td>$<TMPL_VAR name="total"></td>
  		</tr>
! 	</TMPL_LOOP>
  	<tr valign=top bgcolor=white>
  		<td colspan=8><hr>
--- 31,47 ----
  		<td><b>TOTAL</b></td>
  	</tr>
! 	<!-- TMPL_VAR name="count" -->
! 	<!-- TMPL_LOOP name="loop_orders" -->
! 		<tr valign=top bgcolor="<!-- TMPL_VAR name="color" -->">
! 			<td><!-- TMPL_VAR name="basketno" --></td>
! 			<td><!-- TMPL_VAR name="isbn" --></td>
! 			<td><a href="acquire.pl?recieve=<!-- TMPL_VAR name="ordernumber" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->&invoice=<!-- TMPL_VAR name="invoice" -->&gst=<!-- TMPL_VAR name="gst" -->&freight=<!-- TMPL_VAR name="freight" -->&id=<!-- TMPL_VAR name="id" -->"><!-- TMPL_VAR name="title" --></a></td>
! 			<td><!-- TMPL_VAR name="author" --></td>
! 			<td>$<!-- TMPL_VAR name="unitprice" --></td>
  			<td></td>
! 			<td><!-- TMPL_VAR name="quantityrecieved" --></td>
! 			<td>$<!-- TMPL_VAR name="total" --></td>
  		</tr>
! 	<!-- /TMPL_LOOP -->
  	<tr valign=top bgcolor=white>
  		<td colspan=8><hr>
***************
*** 53,60 ****
  		<td></td>
  		<td><b>SUBTOTALS</b></td>
! 		<td>$<TMPL_VAR name="totalprice"></td>
! 		<td><TMPL_VAR name="totalfreight"></td>
! 		<td><TMPL_VAR name="totalquantity"></td>
! 		<td>$<TMPL_VAR name="tototal"></td>
  	</tr>
  	<tr valign=top bgcolor=white>
--- 53,60 ----
  		<td></td>
  		<td><b>SUBTOTALS</b></td>
! 		<td>$<!-- TMPL_VAR name="totalprice" --></td>
! 		<td><!-- TMPL_VAR name="totalfreight" --></td>
! 		<td><!-- TMPL_VAR name="totalquantity" --></td>
! 		<td>$<!-- TMPL_VAR name="tototal" --></td>
  	</tr>
  	<tr valign=top bgcolor=white>
***************
*** 66,74 ****
  		</td>
  		<td colspan=2 align=right><b>GST</b></td>
! 		<td>$<TMPL_VAR name="gst"></td>
  	</tr>
  	<tr valign=top bgcolor=white>
  		<td colspan=2 align=right ><b>TOTAL</b></td>
! 		<td>$<TMPL_VAR name="grandtot"></td>
  	</tr>
  </table>
--- 66,74 ----
  		</td>
  		<td colspan=2 align=right><b>GST</b></td>
! 		<td>$<!-- TMPL_VAR name="gst" --></td>
  	</tr>
  	<tr valign=top bgcolor=white>
  		<td colspan=2 align=right ><b>TOTAL</b></td>
! 		<td>$<!-- TMPL_VAR name="grandtot" --></td>
  	</tr>
  </table>

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** supplier.tmpl	30 May 2003 21:39:51 -0000	1.7
--- supplier.tmpl	9 Dec 2003 10:29:08 -0000	1.8
***************
*** 1,13 ****
! <TMPL_INCLUDE name="acquisitions-top.inc">
  
  <form action=updatesupplier.pl method=post>
  
! <input type=hidden name=id value=<TMPL_VAR name="id">>
  
! <TMPL_IF NAME=id>
! 	<h1>Update: <TMPL_VAR name="name"></h1>
! <TMPL_ELSE>
  	<h1><em>Add supplier</h1>
! </TMPL_IF>
  
  <P>
--- 1,13 ----
! <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  
  <form action=updatesupplier.pl method=post>
  
! <input type=hidden name=id value=<!-- TMPL_VAR name="id" -->>
  
! <!-- TMPL_IF NAME=id -->
! 	<h1>Update: <!-- TMPL_VAR name="name" --></h1>
! <!-- TMPL_ELSE -->
  	<h1><em>Add supplier</h1>
! <!-- /TMPL_IF -->
  
  <P>
***************
*** 19,23 ****
  	<TR VALIGN=TOP>
  		<TD><b>Company Name</b></td>
! 		<td><input type=text size=20 name=company value="<TMPL_VAR name="name">">
  		</td>
  	</tr>
--- 19,23 ----
  	<TR VALIGN=TOP>
  		<TD><b>Company Name</b></td>
! 		<td><input type=text size=20 name=company value="<!-- TMPL_VAR name="name" -->">
  		</td>
  	</tr>
***************
*** 25,49 ****
  		<TD>Postal Address</td>
  		<td>
! 			<textarea name=company_postal cols=20 rows=3><TMPL_VAR name="postal"></textarea>
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Physical Address</td>
! 		<td><textarea name=physical cols=20 rows=4><TMPL_VAR name="address1"><TMPL_VAR name="address2"><TMPL_VAR name="address3"><TMPL_VAR name="address4"></textarea>
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Phone</td>
! 		<td><input type=text size=20 name=company_phone value="<TMPL_VAR name="phone">">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Fax</td>
! 		<td><input type=text size=20 name=company_fax value="<TMPL_VAR name="fax">">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Website</td>
! 		<td><input type=text size=20 name=website value="<TMPL_VAR name="url">">
  		</td>
  	</tr>
--- 25,49 ----
  		<TD>Postal Address</td>
  		<td>
! 			<textarea name=company_postal cols=20 rows=3><!-- TMPL_VAR name="postal" --></textarea>
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Physical Address</td>
! 		<td><textarea name=physical cols=20 rows=4><!-- TMPL_VAR name="address1" --><!-- TMPL_VAR name="address2" --><!-- TMPL_VAR name="address3" --><!-- TMPL_VAR name="address4" --></textarea>
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Phone</td>
! 		<td><input type=text size=20 name=company_phone value="<!-- TMPL_VAR name="phone" -->">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Fax</td>
! 		<td><input type=text size=20 name=company_fax value="<!-- TMPL_VAR name="fax" -->">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Website</td>
! 		<td><input type=text size=20 name=website value="<!-- TMPL_VAR name="url" -->">
  		</td>
  	</tr>
***************
*** 53,90 ****
  	<TR VALIGN=TOP>
  		<TD>Contact Name</td>
! 		<td><input type=text size=20 name=company_contact_name value="<TMPL_VAR name="contact">"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Position</td>
! 		<td><input type=text size=20 name=company_contact_position value="<TMPL_VAR name="contpos">">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Phone</td>
! 		<td><input type=text size=20 name=contact_phone value="<TMPL_VAR name="contphone">">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Alternative Phone</td>
! 		<td><input type=text size=20 name=contact_phone_2 value="<TMPL_VAR name="contaltphone">">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Fax</td>
! 		<td><input type=text size=20 name=contact_fax value="<TMPL_VAR name="contfax">">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>E-mail</td>
! 		<td><input type=text size=20 name=company_email value="<TMPL_VAR name="contemail">">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Notes</td>
! 		<td><textarea name=notes cols=20 rows=4><TMPL_VAR name="contnotes"></textarea>
  		</td>
  	</tr>
  	<tr>
! 		<td colspan=2 align="center"><input type=image  name=submit src="/<TMPL_VAR name="theme">/images/filesave.png" border=0 title="save" alt="save"></td>
  	</tr>
  </table>
--- 53,90 ----
  	<TR VALIGN=TOP>
  		<TD>Contact Name</td>
! 		<td><input type=text size=20 name=company_contact_name value="<!-- TMPL_VAR name="contact" -->"></td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Position</td>
! 		<td><input type=text size=20 name=company_contact_position value="<!-- TMPL_VAR name="contpos" -->">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Phone</td>
! 		<td><input type=text size=20 name=contact_phone value="<!-- TMPL_VAR name="contphone" -->">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Alternative Phone</td>
! 		<td><input type=text size=20 name=contact_phone_2 value="<!-- TMPL_VAR name="contaltphone" -->">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Fax</td>
! 		<td><input type=text size=20 name=contact_fax value="<!-- TMPL_VAR name="contfax" -->">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>E-mail</td>
! 		<td><input type=text size=20 name=company_email value="<!-- TMPL_VAR name="contemail" -->">
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Notes</td>
! 		<td><textarea name=notes cols=20 rows=4><!-- TMPL_VAR name="contnotes" --></textarea>
  		</td>
  	</tr>
  	<tr>
! 		<td colspan=2 align="center"><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="save" alt="save"></td>
  	</tr>
  </table>
***************
*** 96,101 ****
  	<TR VALIGN=TOP>
  		<TD>Supplier is</td>
! 		<td><input type="radio" name="status" value="1" <TMPL_IF name="active">checked</TMPL_IF>>Active
! 			<input type="radio" name="status" value="0" <TMPL_UNLESS name="active">checked</TMPL_UNLESS>>Inactive</td>
  	</tr>
  	<tr valign=top bgcolor="#ffdf61">
--- 96,101 ----
  	<TR VALIGN=TOP>
  		<TD>Supplier is</td>
! 		<td><input type="radio" name="status" value="1" <!-- TMPL_IF name="active" -->checked<!-- /TMPL_IF -->>Active
! 			<input type="radio" name="status" value="0" <!-- TMPL_UNLESS name="active" -->checked<!-- /TMPL_UNLESS -->>Inactive</td>
  	</tr>
  	<tr valign=top bgcolor="#ffdf61">
***************
*** 104,108 ****
  	<TR VALIGN=TOP>
  		<TD>Publishers and Imprints</td>
! 		<td><textarea name="publishers_imprints" cols=20 rows=4><TMPL_VAR name="specialty"></textarea>
  		</td>
  	</tr>
--- 104,108 ----
  	<TR VALIGN=TOP>
  		<TD>Publishers and Imprints</td>
! 		<td><textarea name="publishers_imprints" cols=20 rows=4><!-- TMPL_VAR name="specialty" --></textarea>
  		</td>
  	</tr>
***************
*** 111,117 ****
  		<td>
  			<select name=list_currency size=1>
! 			<TMPL_LOOP name="loop_pricescurrency">
! 				<TMPL_VAR name="currency">
! 			</TMPL_LOOP>
  			</select>
  		</td>
--- 111,117 ----
  		<td>
  			<select name=list_currency size=1>
! 			<!-- TMPL_LOOP name="loop_pricescurrency" -->
! 				<!-- TMPL_VAR name="currency" -->
! 			<!-- /TMPL_LOOP -->
  			</select>
  		</td>
***************
*** 121,127 ****
  		<td>
  			<select name=invoice_currency size=1>
! 			<TMPL_LOOP name="loop_invoicecurrency">
! 				<TMPL_VAR name="currency">
! 			</TMPL_LOOP>
  			</select>
  		</td>
--- 121,127 ----
  		<td>
  			<select name=invoice_currency size=1>
! 			<!-- TMPL_LOOP name="loop_invoicecurrency" -->
! 				<!-- TMPL_VAR name="currency" -->
! 			<!-- /TMPL_LOOP -->
  			</select>
  		</td>
***************
*** 130,135 ****
  		<TD>GST Registered</td>
  		<td>
! 			<input type=radio name=gst value=1 <TMPL_IF name="gstreg">checked</TMPL_IF>>Yes
! 			<input type=radio name=gst value=0 <TMPL_UNLESS name="gstreg">checked</TMPL_UNLESS>>No
  		</td>
  	</tr>
--- 130,135 ----
  		<TD>GST Registered</td>
  		<td>
! 			<input type=radio name=gst value=1 <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Yes
! 			<input type=radio name=gst value=0 <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>No
  		</td>
  	</tr>
***************
*** 137,142 ****
  		<TD>List Item Price Includes GST</td>
  		<td>
! 			<input type=radio name=list_gst value=1 <TMPL_IF name="listincgst">checked</TMPL_IF>>Yes
! 			<input type=radio name=list_gst value=0 <TMPL_UNLESS name="listincgst">checked</TMPL_UNLESS>>No
  		</td>
  	</tr>
--- 137,142 ----
  		<TD>List Item Price Includes GST</td>
  		<td>
! 			<input type=radio name=list_gst value=1 <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>Yes
! 			<input type=radio name=list_gst value=0 <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>No
  		</td>
  	</tr>
***************
*** 144,154 ****
  		<TD>Invoice Item Price Includes GST</td>
  		<td>
! 			<input type=radio name=invoice_gst value=1 <TMPL_IF name= "invoiceincgst">checked</TMPL_IF>>Yes
! 			<input type=radio name=invoice_gst value=0 <TMPL_UNLESS name="invoiceincgst">checked</TMPL_UNLESS>>No
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Discount</td>
! 		<td><input type=text size=3 name=discount value=<TMPL_VAR name="discount">> %
  	</tr>
  </table>
--- 144,154 ----
  		<TD>Invoice Item Price Includes GST</td>
  		<td>
! 			<input type=radio name=invoice_gst value=1 <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>Yes
! 			<input type=radio name=invoice_gst value=0 <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>No
  		</td>
  	</tr>
  	<TR VALIGN=TOP>
  		<TD>Discount</td>
! 		<td><input type=text size=3 name=discount value=<!-- TMPL_VAR name="discount" -->> %
  	</tr>
  </table>
***************
*** 158,160 ****
  
  
! <TMPL_INCLUDE name="acquisitions-bottom.inc">
--- 158,160 ----
  
  
! <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->





More information about the Koha-cvs mailing list