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

Wed Feb 11 10:03:49 CET 2004

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

Modified Files:
	acqui-home.tmpl acquire.tmpl basket.tmpl newbasket2.tmpl 
	newbiblio.tmpl order.tmpl recieveorder.tmpl recieve.tmpl 
	supplier.tmpl 
Log Message:
synch'ing 2.0.0 branch (RC4 tag) and head

Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** acqui-home.tmpl	9 Dec 2003 10:29:07 -0000	1.6
--- acqui-home.tmpl	11 Feb 2004 09:03:47 -0000	1.7
***************
*** 70,74 ****
  			<tr>
  				<td><b>Budgets</B></TD>
! 				<TD><b>Total</B></TD>
  				<TD><b>Spent</B></TD>
  				<TD><b>Comtd</B></TD>
--- 70,74 ----
  			<tr>
  				<td><b>Budgets</B></TD>
! 				<TD><b> Total</B></TD>
  				<TD><b>Spent</B></TD>
  				<TD><b>Comtd</B></TD>
***************
*** 85,89 ****
  			<!-- /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>
--- 85,89 ----
  			<!-- /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>
***************
*** 91,97 ****
  				<TD align=right><b><!-- TMPL_VAR name="totavail" --></b></TD>
  			</TR>
! 		</table><br>
! 		Use your reload button [ctrl + r] to get the most recent figures.
! 		Committed figures are approximate only, as exchange rates will affect the amount actually paid.
  	</TD>
  </TR>
--- 91,98 ----
  				<TD align=right><b><!-- TMPL_VAR name="totavail" --></b></TD>
  			</TR>
! 		</table>
! 		<p>
! 		Use your reload button to get the most recent figures. Committed figures are approximate only, as exchange rates will affect the amount actually paid.
! 		</p>
  	</TD>
  </TR>

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** acquire.tmpl	9 Dec 2003 10:29:08 -0000	1.7
--- acquire.tmpl	11 Feb 2004 09:03:47 -0000	1.8
***************
*** 6,10 ****
  <!-- TMPL_VAR name="date" -->
  </div>
! <h1>Receipt Summary for: <!-- TMPL_VAR name="name" --> Invoice, <!-- TMPL_VAR name="invoice" --></h1>
  <CENTER>
  
--- 6,10 ----
  <!-- TMPL_VAR name="date" -->
  </div>
! <h1>Receipt Summary for: <i><!-- TMPL_VAR name="name" --></i> Invoice <i><!-- TMPL_VAR name="invoice" --></i></h1>
  <CENTER>
  
***************
*** 84,90 ****
  				<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>
--- 84,90 ----
  				<input type=hidden name=gst value="<!-- TMPL_VAR name="gst" -->">
  				<!-- TMPL_IF name="catview" -->
! 					<input type="submit" class="button" value="save">
  				<!-- TMPL_ELSE -->
! 					<a class="button" href=/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR name="ordernumber" -->&id=<!-- TMPL_VAR name="booksellerid" -->>Edit</a>
  				<!-- /TMPL_IF -->
  			</td>
***************
*** 93,97 ****
  	<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>
--- 93,97 ----
  	<table border=1 cellspacing=0 cellpadding=5 width="40%">
  		<tr valign=top bgcolor=#99cc33>
! 			<td background="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td>
  		</tr>
  		<TR VALIGN=TOP>

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** basket.tmpl	9 Dec 2003 10:29:08 -0000	1.7
--- basket.tmpl	11 Feb 2004 09:03:47 -0000	1.8
***************
*** 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 <b><!-- TMPL_VAR name="basket" --> </b>for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->></a> <!-- TMPL_VAR name="name" --></h1><br />
! Our Reference: <b><!-- TMPL_VAR name="entrydate" --></b>, #<b><!-- TMPL_VAR name="basket" --></b> authorised by <b><!-- TMPL_VAR name="loggedinusername" --></b><br />
  <CENTER>
  <p>
***************
*** 8,22 ****
  	<tr valign=top bgcolor="#ffdf61">
  		<td width="5%"><b>Order</b></td>
  		<td width="10%"><b>Isbn</b></td>
  		<td width="30%"><b>Title</b></td>
  		<td width="20%"><b>Author</b></td>
! 		<td width="6%"><b>$ rrp</b></td>
! 		<td width="8%"><b>$est</b></td>
! 		<td width="8%"><b>Qty</b></td>
! 		<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>
--- 8,24 ----
  	<tr valign=top bgcolor="#ffdf61">
  		<td width="5%"><b>Order</b></td>
+ 		<td width="10%"><b> Publisher</b></td>
  		<td width="10%"><b>Isbn</b></td>
  		<td width="30%"><b>Title</b></td>
  		<td width="20%"><b>Author</b></td>
! 		<td width="5%"><b>$ rrp</b></td>
! 		<td width="7%"><b>$est</b></td>
! 		<td width="7%"><b>Qty</b></td>
! 		<td width="7%"><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="publishercode" --></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>
***************
*** 33,37 ****
  		<td colspan=6 rowspan=3  bgcolor="#ffdf61">
    			<b>HELP</b><br>
! 			To change any of the catalogue or accounting information attached to an order,  click on the title.<br>
  		</td>
    		<td><b>SubTotal</b></td>
--- 35,39 ----
  		<td colspan=6 rowspan=3  bgcolor="#ffdf61">
    			<b>HELP</b><br>
! 			To change any of the catalogue or accounting information attached to an order, click on the title.<br>
  		</td>
    		<td><b>SubTotal</b></td>

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** newbasket2.tmpl	9 Dec 2003 10:29:08 -0000	1.7
--- newbasket2.tmpl	11 Feb 2004 09:03:47 -0000	1.8
***************
*** 30,34 ****
  <!-- 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>
--- 30,34 ----
  <!-- TMPL_VAR name="count" -->  results found.
  
! <br> Results <i><!-- TMPL_VAR name="dispnum" --></i> to <i><!-- TMPL_VAR name="offset2" --></i> displayed.
  
  <TABLE  CELLSPACING=0  CELLPADDING=6 border=0>

Index: newbiblio.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** newbiblio.tmpl	9 Dec 2003 10:29:08 -0000	1.8
--- newbiblio.tmpl	11 Feb 2004 09:03:47 -0000	1.9
***************
*** 67,71 ****
  <!-- /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" -->
--- 67,71 ----
  <!-- /TMPL_LOOP -->
  <!-- TMPL_IF name="orderexists" --><input type=hidden name=orderexists value=yes><!-- /TMPL_IF -->
! <a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button">View Basket</a>
  <h1><!-- TMPL_VAR name="ordnum" --> - Order Details </h1><br>
  Shopping Basket For: <!-- TMPL_VAR name="name" -->
***************
*** 74,78 ****
  <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left width="40%">
  	<tr valign=top bgcolor=#99cc33>
! 		<td background="/images/background-mem.gif" colspan=2><B>CATALOGUE DETAILS</B></td>
  	</tr>
  	<TR VALIGN=TOP>
--- 74,78 ----
  <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>
  	</tr>
  	<TR VALIGN=TOP>
***************
*** 85,90 ****
  	</tr>
  	<TR VALIGN=TOP>
  	<TD>Copyright Date</td>
! 	<td><input type=text size=20 name=copyright value="<!-- TMPL_VAR name="copyrightdate" -->">
  	</td>
  	</tr>
--- 85,94 ----
  	</tr>
  	<TR VALIGN=TOP>
+ 		<TD> Publisher</td>
+ 		<td><input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" ></td>
+ 	</tr>
+ 	<TR VALIGN=TOP>
  	<TD>Copyright Date</td>
! 	<td><input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR name="copyrightdate" -->">
  	</td>
  	</tr>
***************
*** 108,112 ****
  <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>
--- 112,116 ----
  <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="<TMPL_VAR name="themelang">/images/background-mem.gif" colspan=2><B>ACCOUNTING DETAILS</B></td></tr>
  	<TR VALIGN=TOP>
  		<TD>Quantity</td>
***************
*** 149,153 ****
  	</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>
--- 153,158 ----
  	</tr>
  	<TR VALIGN=TOP>
! 		<TD colspan=2>
! 		<input type="submit" value="OK" class="button">
  	</tr>
  </table>
***************
*** 155,162 ****
  </center>
  <table>
! <tr><td bgcolor=#cccc99  background="/images/background-mem.gif"><B>HELP</B><br>
  <UL>
! <LI><B>Bold</B> fields must be filled in to create a new bibilo and item.<p>
! <LI>Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also  be entered into the database as the quantity received.
  </UL>
  </td></tr></table>
--- 160,167 ----
  </center>
  <table>
! <tr><td bgcolor=#cccc99  background="<TMPL_VAR name="themelang">/images/background-mem.gif"><B>HELP</B><br>
  <UL>
! <LI>Bold fields must be filled in to create a new bibilo and item.<p>
! <LI>Shaded fields can be used to do a "quick" receive, when items have been purchased locally or gifted. In this case the quantity "ordered" will also be entered into the database as the quantity received.
  </UL>
  </td></tr></table>

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** order.tmpl	9 Dec 2003 10:29:08 -0000	1.11
--- order.tmpl	11 Feb 2004 09:03:47 -0000	1.12
***************
*** 23,27 ****
  	<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>
--- 23,31 ----
  	<tr valign=top bgcolor=<!-- TMPL_VAR name="color" -->>
  		<td>
! 			<!-- TMPL_IF name="active" -->
! 				<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>
! 			<!-- TMPL_ELSE -->
! 				Inactive
! 			<!-- /TMPL_IF -->
  		</td>
  		<td>

Index: recieveorder.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** recieveorder.tmpl	9 Dec 2003 10:29:08 -0000	1.6
--- recieveorder.tmpl	11 Feb 2004 09:03:47 -0000	1.7
***************
*** 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="submit" class="button" value="save">
  </td>
  </tr>

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** recieve.tmpl	9 Dec 2003 10:29:08 -0000	1.6
--- recieve.tmpl	11 Feb 2004 09:03:47 -0000	1.7
***************
*** 6,10 ****
  <!-- TMPL_VAR name="date" -->
  </div>
! <h1>Receipt Summary for : <!-- TMPL_VAR name="name" -->, Invoice <!-- TMPL_VAR name="invoice" --></h1>
  <CENTER>
  
--- 6,10 ----
  <!-- TMPL_VAR name="date" -->
  </div>
! <h1>Receipt Summary for : <i><!-- TMPL_VAR name="name" --></i> Invoice <i><!-- TMPL_VAR name="invoice" --></i></h1>
  <CENTER>
  

Index: supplier.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** supplier.tmpl	9 Dec 2003 10:29:08 -0000	1.8
--- supplier.tmpl	11 Feb 2004 09:03:47 -0000	1.9
***************
*** 85,91 ****
  		</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>
  
--- 85,88 ----
***************
*** 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">
--- 93,104 ----
  	<TR VALIGN=TOP>
  		<TD>Supplier is</td>
! 		<td>
! 			 <!-- TMPL_IF name="active" -->
! 				<input type="radio" name="status" value="1" checked>Active
! 				<input type="radio" name="status" value="0">Inactive</td>
! 			<!-- TMPL_ELSE -->
! 				<input type="radio" name="status" value="1">Active
! 				<input type="radio" name="status" value="0"checked>Inactive</td>
! 			<!-- /TMPL_IF -->
  	</tr>
  	<tr valign=top bgcolor="#ffdf61">
***************
*** 153,157 ****
  	</tr>
  </table>
! 
  </form>
  </center>
--- 156,161 ----
  	</tr>
  </table>
! <br/>
! <br/><input type=image  name=submit src="/<!-- TMPL_VAR name="theme" -->/images/filesave.png" border=0 title="save" alt="save" class="button">
  </form>
  </center>