[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui acquire.tmpl,1.12,1.13 newbasket2.tmpl,1.12,1.13 order.tmpl,1.18,1.19 recieveorder.tmpl,1.9,1.10 recieve.tmpl,1.9,1.10 suggestion-select.tmpl,1.2,1.3

Paul POULAIN tipaul at users.sourceforge.net
Thu Aug 12 16:37:15 CEST 2004


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

Modified Files:
	acquire.tmpl newbasket2.tmpl order.tmpl recieveorder.tmpl 
	recieve.tmpl suggestion-select.tmpl 
Log Message:
* updates to make acquisition compatible with suggestions & serials
* changes to use supplierid instead of id, that's easier to read.

Index: acquire.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** acquire.tmpl	19 Jul 2004 19:21:15 -0000	1.12
--- acquire.tmpl	12 Aug 2004 14:37:11 -0000	1.13
***************
*** 3,26 ****
  <div id="mainbloc">
  <h1 class="acquisition">Receipt Summary for: <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i></h1>
- 	<div id="bloc25">
- 		Invoice: <!-- TMPL_VAR NAME="invoice" --><br>
- 		Received By: <!-- TMPL_VAR NAME="user" --><br>
- 		<!-- TMPL_VAR NAME="date" -->
- 	</div>
  
  	<!-- TMPL_IF name="count" -->
- 		<script language="javascript" type="text/javascript">
- 		<!--
- 		function messenger(X,Y,etc){
- 		win=window.open("","mess","height="+X+",width="+Y+",screenX=150,screenY=0");
- 		win.focus();
- 		win.document.close();
- 		win.document.write("<body link='#333333' bgcolor='#ffffff' text='#000000'><font size="2"><p><br>");
- 		win.document.write(etc);
- 		win.document.write("<center><form><input type=button onclick='self.close()' value="Close"></form></center>");
- 		win.document.write("</font></body></html>");
- 		}
- 		//-->
- 		</script>
  		<form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
  		<h1 class="acquisition"><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
--- 3,8 ----
***************
*** 30,82 ****
  				<h2 class="acquisition">catalogue details</h2>
  			<p>
! 				<label>Title *</label>
! 				<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" >
  			</p>
  			<p>
! 				<label>Author</label>
! 				<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->" >
  			</p>
  			<p>
! 				<label>Copyright Date</label>
! 				<input type="text" size="20" name="copyright" value="<!-- TMPL_VAR NAME="copyrightdate" -->" >
  			</p>
  			<p>
! 				<label>Format</label>
! 				<!-- TMPL_VAR NAME="CGIitemtype" -->
  			</p>
  			<p>
! 				<label>ISBN</label>
! 				<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
  			</p>
  			<p>
! 				<label>Series</label>
! 				<input type="text" size="20" name="Series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
  			</p>
  			<p>
! 				<label>Branch</label>
  				<!-- TMPL_VAR NAME="CGIbranch" -->
  			</p>
  			<p>
! 				<label>Item Barcode *</label>
! 				<input type="text" size="20" name="barcode" value="<!-- TMPL_VAR NAME="barcode" -->">
! 			</p>
! 			<p>
! 				<label>Volume Info (for serials) *</label>
! 				<input type="text" size="20" name="volinf">
! 			</p>
! 			<p>
! 					<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="submit" class="button acquisition" value="save">
! 					<!-- TMPL_ELSE -->
! 						<a class="button acquisition" href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;id=<!-- TMPL_VAR NAME="booksellerid" -->">
! 							Edit
! 						</a>
! 					<!-- /TMPL_IF -->
  			</p>
  		</div>
--- 12,46 ----
  				<h2 class="acquisition">catalogue details</h2>
  			<p>
! 				<label class="label100">Title </label>
! 				<!-- TMPL_VAR NAME="title" -->
  			</p>
  			<p>
! 				<label class="label100">Author</label>
! 				<!-- TMPL_VAR NAME="author" -->
  			</p>
  			<p>
! 				<label class="label100">Copyright Date</label>
! 				<!-- TMPL_VAR NAME="copyrightdate" -->
  			</p>
  			<p>
! 				<label class="label100">Format</label>
! 				<!-- TMPL_VAR NAME="itemtype" -->
  			</p>
  			<p>
! 				<label class="label100">ISBN</label>
! 				<!-- TMPL_VAR NAME="isbn" -->
  			</p>
  			<p>
! 				<label class="label100">Series</label>
! 				<!-- TMPL_VAR NAME="seriestitle" -->
  			</p>
+ 			<p>Enter barcode(s) and branch if you want to add item(s) immediatly</p>
  			<p>
! 				<label class="label100">Branch</label>
  				<!-- TMPL_VAR NAME="CGIbranch" -->
  			</p>
  			<p>
! 				<label class="label100">Item Barcode *</label>
! 				<input type=text size=20 name=barcode value="<!-- TMPL_VAR name="barcode" -->">
  			</p>
  		</div>
***************
*** 84,118 ****
  			<h2 class="acquisition">Accounting details</h2>
  			<p>
! 				<label>Bookfund *</label>
! 				<!-- TMPL_VAR NAME="CGIbookfund" -->
  			</p>
  			<p>
! 				<label>Quantity Ordered</label>
! 				<input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->">
  			</p>
  			<p>
! 				<label>Quantity Received *</label>
  				<input type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->">
  			</p>
  			<p>
! 				<label>Replacement Cost</label>
  				<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->">
  			</p>
  			<p>
! 				<label>Budgeted Cost </label>
! 				<input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->">
  			</p>
  			<p>
! 				<label>Actual Cost *</label>
  				<input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->">
  			</p>
  			<p>
! 				<label>Invoice Number</label>
  					<!-- TMPL_VAR NAME="invoice" -->
  					<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
  			</p>
  			<p>
! 				<label>Notes</label>
! 				<td><input type="text" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->"></td>
  			</p>
  		</div>
--- 48,98 ----
  			<h2 class="acquisition">Accounting details</h2>
  			<p>
! 				<label class="label100">Bookfund</label>
! 				<!-- TMPL_VAR NAME="bookfund" -->
  			</p>
  			<p>
! 				<label class="label100">Quantity Ordered</label>
! 				<!-- TMPL_VAR NAME="quantity" -->
! 				<input type="hidden" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->">
  			</p>
  			<p>
! 				<label class="label100">Quantity Received *</label>
  				<input type="text" size="20" name="quantityrec" value="<!-- TMPL_VAR NAME="quantityreceived" -->">
  			</p>
  			<p>
! 				<label class="label100">Replacement Cost</label>
  				<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->">
  			</p>
  			<p>
! 				<label class="label100">Budgeted Cost </label>
! 				<!-- TMPL_VAR NAME="ecost" -->
  			</p>
  			<p>
! 				<label class="label100">Actual Cost *</label>
  				<input type="text" size="20" name="cost" value="<!-- TMPL_VAR NAME="unitprice" -->">
  			</p>
  			<p>
! 				<label class="label100">Invoice Number</label>
  					<!-- TMPL_VAR NAME="invoice" -->
  					<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
  			</p>
  			<p>
! 				<label class="label100">Notes</label>
! 				<!-- TMPL_VAR NAME="notes" -->
! 			</p>
! 			<p>
! 				<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="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
! 				<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="submit" class="button acquisition" value="save">
! 				<!-- TMPL_ELSE -->
! 					<a class="button acquisition" href="/cgi-bin/koha/acqui/newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&amp;booksellerid=<!-- TMPL_VAR NAME="supplierid" -->">
! 						Edit
! 					</a>
! 				<!-- /TMPL_IF -->
  			</p>
  		</div>
***************
*** 132,136 ****
  				<td><!-- TMPL_VAR NAME="basketno" --></td>
  				<td><!-- TMPL_VAR NAME="isbn" --></td>
! 				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
  				<td><!-- TMPL_VAR NAME="quantity" --></td>
--- 112,116 ----
  				<td><!-- TMPL_VAR NAME="basketno" --></td>
  				<td><!-- TMPL_VAR NAME="isbn" --></td>
! 				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
  				<td><!-- TMPL_VAR NAME="quantity" --></td>

Index: newbasket2.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** newbasket2.tmpl	19 Jul 2004 19:21:15 -0000	1.12
--- newbasket2.tmpl	12 Aug 2004 14:37:11 -0000	1.13
***************
*** 2,17 ****
  <div id="mainbloc">
  	<h1 class="acquisition">Shopping Basket For: <!-- TMPL_VAR NAME="bookselname" --></h1>
! 	<!-- TMPL_IF name ="testdonation" -->
! 		<a href="newbiblio.pl?id=<!-- TMPL_VAR NAME="id" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
  		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Add New Biblio"></a>
- 	<!-- TMPL_ELSE -->
- 		<a href="newdonation.pl?id=<!-- TMPL_VAR NAME="id" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
- 		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png"  border="0" 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" 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="text"  size="25"   name="search">
--- 2,12 ----
  <div id="mainbloc">
  	<h1 class="acquisition">Shopping Basket For: <!-- TMPL_VAR NAME="bookselname" --></h1>
! 		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;sub=<!-- TMPL_VAR NAME="parsub" -->">
  		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filenew.png" border="0" alt="Add New Biblio"></a>
  	<a href="basket.pl?basket=<!-- TMPL_VAR NAME="basket" -->">
  		<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1uparrow.png"  border="0" alt="View Basket">
  	</a>
  	<form action="/cgi-bin/koha/acqui/newbasket2.pl">
! 	<input type="hidden" name="booksellerid" value=<!-- TMPL_VAR NAME="booksellerid" -->>
  	<input type="hidden" name="basket" value=<!-- TMPL_VAR NAME="basket" -->>
  	<b>New Search: </b><input="text"  size="25"   name="search">
***************
*** 42,59 ****
  		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  			<td>
! 				<!-- TMPL_IF name="testdonation" -->
! 					<a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR NAME="sub" -->&amp;author=<!-- TMPL_VAR NAME="author2" -->&amp;copyright=<!-- TMPL_VAR NAME="copyright" -->&amp;id=<!-- TMPL_VAR NAME="id" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;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" -->&amp;copyright=<!-- TMPL_VAR NAME="copyright" -->&amp;id=<!-- TMPL_VAR NAME="id" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;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" -->&amp;type=<!-- TMPL_VAR NAME="type" -->">
  				<!-- TMPL_VAR NAME="author" -->
- 				</a>
  			</td>
  			<td>
--- 37,46 ----
  		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  			<td>
! 					<a href="/cgi-bin/koha/acqui/newbiblio.pl?sub=<!-- TMPL_VAR NAME="sub" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
  					<!-- TMPL_VAR NAME="title" -->
  					</a>
  			</td>
  			<td>
  				<!-- TMPL_VAR NAME="author" -->
  			</td>
  			<td>
***************
*** 98,102 ****
  	
  	<!-- TMPL_IF name="offsetover" -->
! 	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;id=<!-- TMPL_VAR NAME="id" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
  	Next
  	</a>
--- 85,89 ----
  	
  	<!-- TMPL_IF name="offsetover" -->
! 	<a href="/cgi-bin/koha/acqui/newbasket2.pl?num=<!-- TMPL_VAR NAME="num" -->&amp;offset=<!-- TMPL_VAR NAME="offset" -->&amp;type=<!-- TMPL_VAR NAME="type" -->&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
  	Next
  	</a>

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** order.tmpl	30 Jul 2004 14:52:04 -0000	1.18
--- order.tmpl	12 Aug 2004 14:37:11 -0000	1.19
***************
*** 7,23 ****
  <tr>
  	<th class="acquisition">Order</th>
- 	<th class="acquisition">View gapped numbers</th>
  	<th class="acquisition">Receive</th>
  	<th class="acquisition">Company</th>
! 	<th class="acquisition">
! 		<table class="noborder">
! 			<tr>
! 				<th class="acquisition">Basket</th>
! 				<th class="acquisition">Items</th>
! 				<th class="acquisition">Staff</th>
! 				<th class="acquisition">Date</th>
! 			</tr>
! 		</table>
! 	</td>
  </tr>
  
--- 7,13 ----
  <tr>
  	<th class="acquisition">Order</th>
  	<th class="acquisition">Receive</th>
  	<th class="acquisition">Company</th>
! 	<th class="acquisition">&nbsp;</th>
  </tr>
  
***************
*** 26,30 ****
  		<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
--- 16,20 ----
  		<td>
  			<!-- TMPL_IF name="active" -->
! 				<a href="basket.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><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
***************
*** 32,45 ****
  		</td>
  		<td>
! 			<!-- TMPL_IF name="active" -->
! <div align="center">				<a href="select-late.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></div>
! 			<!-- TMPL_ELSE -->
! 				Inactive
! 			<!-- /TMPL_IF -->
! 		</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>
--- 22,28 ----
  		</td>
  		<td>
! 			<a href="recieveorder.pl?supplierid=<!-- TMPL_VAR name=supplierid -->"><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?supplierid=<!-- TMPL_VAR name=supplierid -->"><!-- TMPL_VAR name="name" --></a></td>
  		<td>
  			<table width="100%" cellspacing=0 cellpadding=5 border=0>
***************
*** 71,75 ****
  	</table>
  	</div>
! 	<a class="button acquisition" href="supplier.pl?supplerid=0">Add supplier</a>
  </div>
  <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
--- 54,58 ----
  	</table>
  	</div>
! 	<a class="button acquisition" href="supplier.pl?supplierid=0">Add supplier</a>
  </div>
  <!-- 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.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** recieveorder.tmpl	19 Jul 2004 19:21:15 -0000	1.9
--- recieveorder.tmpl	12 Aug 2004 14:37:11 -0000	1.10
***************
*** 1,9 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
  	<div id="bloc25">
  		<form method="get" action="receive.pl">
  		<p>
! 			<input type="hidden" name="id" value=<!-- TMPL_VAR NAME="id" -->>
  			<h2 class="acquisition">Supplier invoice information</h2>
  		<p>
--- 1,9 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Receive Orders From Supplier <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="name" --></a></h1>
  	<div id="bloc25">
  		<form method="get" action="receive.pl">
  		<p>
! 			<input type="hidden" name="supplierid" value=<!-- TMPL_VAR NAME="supplierid" -->>
  			<h2 class="acquisition">Supplier invoice information</h2>
  		<p>

Index: recieve.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** recieve.tmpl	19 Jul 2004 19:21:15 -0000	1.9
--- recieve.tmpl	12 Aug 2004 14:37:11 -0000	1.10
***************
*** 12,16 ****
  	<div id="bloc25">
  		<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" -->">
--- 12,16 ----
  	<div id="bloc25">
  		<form action="/cgi-bin/koha/acqui/acquire.pl">
! 			<input type="hidden" name="supplierid" value="<!-- TMPL_VAR NAME="supplierid" -->">
  			<input type="hidden" name="gst" value="<!-- TMPL_VAR NAME="gst" -->">
  			<input type="hidden" name="freight" value="<!-- TMPL_VAR NAME="freight" -->">
***************
*** 38,42 ****
  				<td><!-- TMPL_VAR NAME="basketno" --></td>
  				<td><!-- TMPL_VAR NAME="isbn" --></td>
! 				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
  				<td>$<!-- TMPL_VAR NAME="unitprice" --></td>
--- 38,42 ----
  				<td><!-- TMPL_VAR NAME="basketno" --></td>
  				<td><!-- TMPL_VAR NAME="isbn" --></td>
! 				<td><a href="acquire.pl?recieve=<!-- TMPL_VAR NAME="ordernumber" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->&amp;invoice=<!-- TMPL_VAR NAME="invoice" -->&amp;gst=<!-- TMPL_VAR NAME="gst" -->&amp;freight=<!-- TMPL_VAR NAME="freight" -->&amp;supplierid=<!-- TMPL_VAR NAME="supplierid" -->"><!-- TMPL_VAR NAME="title" --></a></td>
  				<td><!-- TMPL_VAR NAME="author" --></td>
  				<td>$<!-- TMPL_VAR NAME="unitprice" --></td>

Index: suggestion-select.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** suggestion-select.tmpl	19 Jul 2004 19:21:15 -0000	1.2
--- suggestion-select.tmpl	12 Aug 2004 14:37:11 -0000	1.3
***************
*** 50,54 ****
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 					<a href="newbiblio.pl?id=<!-- TMPL_VAR NAME="supplierid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
  				</td>
  			</tr>
--- 50,58 ----
  				</td>
  				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
! 					<!-- TMPL_IF name="biblionumber" -->
! 						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->&biblio=<!-- TMPL_VAR name="biblionumber" -->" class="button acquisition">Order</a>
! 					<!-- TMPL_ELSE -->
! 						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basket=<!-- TMPL_VAR NAME="basket" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
! 					<!-- /TMPL_IF -->
  				</td>
  			</tr>





More information about the Koha-cvs mailing list