[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/acqui suggestion-select.tmpl,NONE,1.1 acqui-home.tmpl,1.11,1.12 basket.tmpl,1.9,1.10 newbiblio.tmpl,1.11,1.12 order.tmpl,1.14,1.15

Paul POULAIN tipaul at users.sourceforge.net
Thu Jul 15 11:46:38 CEST 2004


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

Modified Files:
	acqui-home.tmpl basket.tmpl newbiblio.tmpl order.tmpl 
Added Files:
	suggestion-select.tmpl 
Log Message:
Acquisition & Suggestion :
* acquisition rewritte : create a aqbasket table to deal with "bookseller order header".
* add "close basket" feature : a closed basket can't be modified
* suggestion feature : manage suggestions in acquisition (after suggestion filled in OPAC)

--- NEW FILE ---
<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
<div id="mainbloc">

<!-- TMPL_IF name="op_else" -->
	<h1 class="acquisition">Suggestions</h1>
	<table>
		<tr>
			<th class="acquisition">Suggestion</th>
			<th class="acquisition">Suggested by</th>
			<th class="acquisition">Accepted by</th>
			<th class="acquisition">&nbsp;</th>
		</tr>
		<tr>
			<form>
				<th class="acquisition">
					<p>Filter on :
					title: <input type="text" name="title" value="<!-- TMPL_VAR name="title"-->">
					author: <input type="text" name="author" value="<!-- TMPL_VAR name="author" -->">
					publisher: <input type="text" name="publishercode" value="<!-- TMPL_VAR name="publishercode"-->">
				</th>
				<th class="acquisition">
					&nbsp;
				</th>
				<th class="acquisition">
					&nbsp;
				</th>
				<th class="acquisition">
					<input type="submit" class="button acquisition" value="Set Filter">
				</th>
			</form>
		</tr>
		<!-- TMPL_LOOP NAME="suggestions_loop" -->
			<tr>
				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
					<p><!-- TMPL_VAR NAME="title" --> - <!-- TMPL_VAR NAME="author" --></p>
					<p>
						<!-- TMPL_IF name="copyrightdate" -->copy. year:<!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="volumedesc" -->volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="isbn" -->ISBN :<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="publishercode" --><br/>published by:<!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="place" --> at <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF -->
						<!-- TMPL_IF name="note" --><p><i>(<!-- TMPL_VAR name="note" -->)</i></p> <!-- /TMPL_IF -->
				</td>
				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
					<!-- TMPL_VAR name="surnamesuggestedby" --><!-- TMPL_IF name="firstnamesuggestedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamesuggestedby" -->
				</td>
				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
					<!-- TMPL_VAR name="usermanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR name="firstnamemanagedby" -->
				</td>
				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
					<a href="newbiblio.pl??id=<!-- TMPL_VAR name="supplierid" -->&basket=<!-- TMPL_VAR name="basket" -->&suggestionid=<!-- TMPL_VAR name="suggestionid" -->" class="button acquisition">Order</a>
				</td>
			</tr>
		<!-- /TMPL_LOOP -->
	</table>
	<form>

<!-- /TMPL_IF -->
</div>
<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
Index: acqui-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** acqui-home.tmpl	3 Jun 2004 10:09:22 -0000	1.11
--- acqui-home.tmpl	15 Jul 2004 09:46:31 -0000	1.12
***************
*** 25,28 ****
--- 25,38 ----
  </div>
  
+ <!-- suggestions -->
+ <div id="bloc25">
+ 	<h2 class="acquisition">Suggestions to check</h2>
+ 		<!-- TMPL_IF name="suggestion">
+ 			<!--TMPL_VAR name="suggestion" --> suggestions waiting <a href="/cgi-bin/koha/suggestion/acceptorreject.pl" class="button acquisition">Manage</a>
+ 		<!-- TMPL_ELSE -->
+ 			No suggestions waiting
+ 		<!-- /TMPL_IF -->
+ </div>
+ 
  <!-- showbudget-->
  <div id="bloc25">

Index: basket.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** basket.tmpl	17 Jun 2004 08:19:40 -0000	1.9
--- basket.tmpl	15 Jul 2004 09:46:31 -0000	1.10
***************
*** 2,62 ****
  
  <div id="mainbloc">
! 	<h1 class="acquisition">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 />
! 	<p>
! 	<table>
! 		<tr valign=top bgcolor="#ffdf61">
! 			<th class="acquisition" width="5%">Order</th>
! 			<th class="acquisition" width="10%">Publisher</th>
! 			<th class="acquisition" width="10%">Isbn</th>
! 			<th class="acquisition" width="30%">Title</th>
! 			<th class="acquisition" width="20%">Author</th>
! 			<th class="acquisition" width="5%">$ rrp</th>
! 			<th class="acquisition" width="7%">$est</th>
! 			<th class="acquisition" width="7%">Qty</th>
! 			<th class="acquisition" width="7%">Total</th>
! 		</tr>
! 		<!-- TMPL_LOOP name="books_loop" -->
! 			<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>
! 				<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>
! 			<td colspan=6 rowspan=3>
! 				&nbsp;
! 			</td>
! 			<td><b>SubTotal</b></td>
! 			<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
! 		</tr>
! 		<tr>
! 			<td><b>GST</b></td>
! 			<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
! 		</tr>
! 		<tr>
! 			<td><b>TOTAL</b></td>
! 			<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="grand_total" --></td>
! 		</tr>
! 		<tr>
! 			<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>
! 			</td>
! 		</tr>
! 	
! 	</table>
! 	</CENTER>
  </div>
  <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
--- 2,81 ----
  
  <div id="mainbloc">
! 	<h1 class="acquisition"><!-- TMPL_UNLESS name="basketno" -->New <!-- /TMPL_UNLESS -->shopping Basket <b><!-- TMPL_VAR name="basketno" --> </b>for <a href=supplier.pl?id=<!-- TMPL_VAR name="booksellerid" -->><!-- TMPL_VAR name="name" --></a></h1><br />
! 	<div id="bloc25">
! 		<h2 class="acquisition">Basket info</h2>
! 			<p><label class="label100">Basket number<label> <!-- TMPL_VAR name="basketno" --></p>
! 			<p><label class="label100">Managed by<label><!-- TMPL_VAR name="authorisedbyname" --></p>
! 			<p><label class="label100">open on<label> <!-- TMPL_VAR name="creationdate" --></p>
! 			<p><label class="label100">for<label> <!-- TMPL_VAR name="booksellerid" --></p>
! 			<p><label class="label100">Invoice number </label><!-- TMPL_VAR name="booksellerinvoicenumber" --></p>
! 			<a href="/cgi-bin/koha/acqui/order.pl?op=close&basket=<!-- TMPL_VAR name="basketno" -->" class="button acquisition">Close</a>
! 	</div>
! 	<div id="bloc100">
! 	<h2 class="acquisition">Order</h2>
! 	<!-- TMPL_IF name="books_loop" -->
! 		<table>
! 			<tr valign=top bgcolor="#ffdf61">
! 				<th class="acquisition" width="5%">Order</th>
! 				<th class="acquisition" width="10%">Publisher</th>
! 				<th class="acquisition" width="10%">Isbn</th>
! 				<th class="acquisition" width="30%">Title</th>
! 				<th class="acquisition" width="20%">Author</th>
! 				<th class="acquisition" width="5%">$ rrp</th>
! 				<th class="acquisition" width="7%">$est</th>
! 				<th class="acquisition" width="7%">Qty</th>
! 				<th class="acquisition" width="7%">Total</th>
  			</tr>
! 			<!-- TMPL_LOOP name="books_loop" -->
! 				<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" -->&booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR name="title" --></a></td>
! 					<td><!-- TMPL_VAR name="author" --></td>
! 					<td><!-- TMPL_VAR name="rrp" --></td>
! 					<td><!-- TMPL_VAR name="ecost" --></td>
! 					<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="basketno" -->">
! 			<tr>
! 				<td colspan=6 rowspan=3>
! 					&nbsp;
! 				</td>
! 				<td><b>SubTotal</b></td>
! 				<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="sub_total" --></td>
! 			</tr>
! 			<tr>
! 				<td><b>GST</b></td>
! 				<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="gist" --></td>
! 			</tr>
! 			<tr>
! 				<td><b>TOTAL</b></td>
! 				<td><!-- TMPL_VAR name="currency" --><!-- TMPL_VAR name="grand_total" --></td>
! 			</tr>
! 		</table>
! 	<!-- TMPL_ELSE -->
! 		<p>Basket empty</p>
! 	<!-- /TMPL_IF -->
! 	</div>
! 	<div id="bloc25">
! 		<h2 class="acquisition">Add order line</h2>
! 		<form action="/cgi-bin/koha/acqui/newbasket2.pl" method=post>
! 			<input type=hidden name=booksellerid value="<!-- TMPL_VAR name="booksellerid" -->">
! 			<input type=hidden name=basketno value="<!-- TMPL_VAR name="basketno" -->">
! 			<p>from an existing biblio: </b><input type="text"  size="25"   name="search"><input type="submit" class="button acquisition" value="Search"></p>
! 			<p>or
! 				<a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->" class="button acquisition">
! 					from a suggestion
! 				</a>
! 				<a href="/cgi-bin/koha/acqui/newbiblio.pl?booksellerid=<!-- TMPL_VAR name="booksellerid" -->&basketno=<!-- TMPL_VAR name="basketno" -->" class="button acquisition">
! 					New biblio
! 				</a>
! 			</p>
! 		</form>
! 	</div>
  </div>
  <!-- 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.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** newbiblio.tmpl	2 Jul 2004 15:55:07 -0000	1.11
--- newbiblio.tmpl	15 Jul 2004 09:46:31 -0000	1.12
***************
*** 54,106 ****
  	<!-- 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 -->" class="button acquisition">View Basket</a>
! 	<h1 class="acquisition"><!-- TMPL_VAR name="ordnum" --> - Order Details </h1>
  	Shopping Basket For <!-- TMPL_VAR name="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">catalogue details</h2>
  		<p>
! 			<label><b>Title *</b></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> Publisher</label>
  			<input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" >
  		</p>
  		<p>
! 			<label>Copyright Date</label>
  			<input type=text size=20 name=copyrightdate 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>
--- 54,113 ----
  	<!-- 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="basketno" value="<!-- TMPL_VAR name="basketno" -->">
! 	<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR name="booksellerid" -->">
! 	<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" -->">
! 	<input type="hidden" name="suggestionid" value="<!-- TMPL_VAR name="suggestionid" -->">
  	<!-- TMPL_LOOP name="loop_currencies" -->
  		<input type=hidden name="<!-- TMPL_VAR name="currency" -->" value="<!-- TMPL_VAR name="rate" -->">
  	<!-- /TMPL_LOOP -->
  	<a href="basket.pl?basket=<!-- TMPL_VAR name=basket -->" class="button acquisition">View Basket</a>
! 	<h1 class="acquisition">
! 		<!-- TMPL_IF name="ordnum" -->
! 			Modify order details (line #<!-- TMPL_VAR name="ordnum" -->)
! 		<!-- TMPL_ELSE -->
! 			New order
! 		<!-- /TMPL_IF -->
! 		 <!-- TMPL_IF name="suggestionid" -->(defined from suggestion #<!-- TMPL_VAR name="suggestionid" -->)<!-- /TMPL_IF -->
! 	</h1>
  	Shopping Basket For <!-- TMPL_VAR name="name" -->
  	<div id="bloc25">
  		<h2 class="acquisition">catalogue details</h2>
  		<p>
! 			<label class="label100"><b>Title *</b></label>
  			<input type=text size=20 name=title value="<!-- TMPL_VAR name="title" -->">
  		</p>
  		<p>
! 			<label class="label100">Author</label>
  			<input type=text size=20 name=author value="<!-- TMPL_VAR name="author" -->" >
  		</p>
  		<p>
! 			<label class="label100"> Publisher</label>
  			<input type=text size=30 name=publishercode value="<!-- TMPL_VAR name="publishercode" -->" >
  		</p>
  		<p>
! 			<label class="label100">Copyright Date</label>
  			<input type=text size=20 name=copyrightdate value="<!-- TMPL_VAR name="copyrightdate" -->">
  		</p>
  		<p>
! 			<label class="label100">Format</label>
  			<!-- TMPL_VAR name="CGIitemtype" -->
  		</p>
  		<p>
! 			<label class="label100">ISBN</label>
  			<input type=text size=20 name=ISBN value="<!-- TMPL_VAR name="isbn" -->">
  		</p>
  		<p>
! 			<label class="label100">Series</label>
  			<input type=text size=20 name=Series value="<!-- TMPL_VAR name="seriestitle" -->">
  		</p>
  		<p>
! 			<label class="label100">Branch</label>
  			<!-- TMPL_VAR name="CGIbranch" -->
  		</p>
***************
*** 109,157 ****
  		<h2 class="acquisition">Accounting details</h2>
  		<p>
! 			<label>Quantity</label>
  			<input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->" onchange='update(this.form)' >
  		</p>
  		<p>
! 			<label>Bookfund</label>
  			<!-- TMPL_VAR name="CGIbookfund" -->
  		</p>
  		<p>
! 			<label>Suppliers List Price</label>
  			<input type=text size=20 name=list_price value="<!-- TMPL_VAR name="listprice" -->" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label>Replacement Cost </label>
  			<input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label>Budgeted Cost</label>
  			<input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label>Budgeted GST</label>
  			<input type=text size=20 name=GST value="" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label><B>BUDGETED TOTAL</B></label>
  			<input type=text size=20 name=total value="" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label>Actual Cost</label>
  			<input type=text size=20 name=cost>
  		</p>
  		<p>
! 			<label>Invoice Number *</label>
  			<input type=text size=20 name=invoice >
  		<p>
! 			<label>Notes</label>
  			<input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->">
  		</p>
  		<p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
  		<p>
! 			<label>Sort field 1</label>
  			<input type=text size=20 name=sort1 value="<!-- TMPL_VAR name="sort1" -->">
  		</p>
  		<p>
! 			<label>Sort field 2</label>
  			<input type=text size=20 name=sort2 value="<!-- TMPL_VAR name="sort2" -->">
  		</p>
--- 116,164 ----
  		<h2 class="acquisition">Accounting details</h2>
  		<p>
! 			<label class="label100">Quantity</label>
  			<input type=text size=20 name=quantity value="<!-- TMPL_VAR name="quantity" -->" onchange='update(this.form)' >
  		</p>
  		<p>
! 			<label class="label100">Bookfund</label>
  			<!-- TMPL_VAR name="CGIbookfund" -->
  		</p>
  		<p>
! 			<label class="label100">Suppliers List Price</label>
  			<input type=text size=20 name=list_price value="<!-- TMPL_VAR name="listprice" -->" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label class="label100">Replacement Cost </label>
  			<input type=text size=20 name=rrp value="<!-- TMPL_VAR name="rrp" -->" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label class="label100">Budgeted Cost</label>
  			<input type=text size=20 name=ecost value="<!-- TMPL_VAR name="ecost" -->" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label class="label100">Budgeted GST</label>
  			<input type=text size=20 name=GST value="" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label class="label100"><B>BUDGETED TOTAL</B></label>
  			<input type=text size=20 name=total value="" onchange='update(this.form)'>
  		</p>
  		<p>
! 			<label class="label100">Actual Cost</label>
  			<input type=text size=20 name=cost>
  		</p>
  		<p>
! 			<label class="label100">Invoice Number *</label>
  			<input type=text size=20 name=invoice >
  		<p>
! 			<label class="label100">Notes</label>
  			<input type=text size=20 name=notes value="<!-- TMPL_VAR name="notes" -->">
  		</p>
  		<p>The 2 following fields are available for your own usage. They can be useful for stat purposes</p>
  		<p>
! 			<label class="label100">Sort field 1</label>
  			<input type=text size=20 name=sort1 value="<!-- TMPL_VAR name="sort1" -->">
  		</p>
  		<p>
! 			<label class="label100">Sort field 2</label>
  			<input type=text size=20 name=sort2 value="<!-- TMPL_VAR name="sort2" -->">
  		</p>

Index: order.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** order.tmpl	17 Jun 2004 08:19:40 -0000	1.14
--- order.tmpl	15 Jul 2004 09:46:31 -0000	1.15
***************
*** 1,53 ****
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <div id="mainbloc">
! <h1 class="acquisition">Supplier Search Results</h1>
! <div id="bloc100">
! <h2 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
! <table>
! <tr>
! 	<th class="acquisition">Order</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>
! 
! <!-- TMPL_LOOP name="loop_suppliers" -->
! 	<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>
! 			<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 acquisition" href="supplier.pl?id=0">Add supplier</a>
  <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
--- 1,64 ----
  <!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
  <div id="mainbloc">
! 	<h1 class="acquisition">Supplier Search Results</h1>
! 	<div id="bloc100">
! 	<h2 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h2>
! 	<table>
! 	<tr>
! 		<th class="acquisition">Order</th>
! 		<th class="acquisition">Receive</th>
! 		<th class="acquisition">Supplier</th>
! 		<th class="acquisition">
! 			&nbsp;
! 		</th>
! 	</tr>
! 	
! 	<!-- TMPL_LOOP name="loop_suppliers" -->
! 		<!-- TMPL_IF name="even" -->
! 		<tr bgcolor="#EEEEEE">
! 		<!-- TMPL_ELSE -->
! 		<tr>
! 		<!-- /TMPL_IF -->
! 			<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
! 				<!-- /TMPL_IF -->
! 			</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>
  					<tr>
! 						<th class="acquisition">Basket</th>
! 						<th class="acquisition">Items</th>
! 						<th class="acquisition">Created by</th>
! 						<th class="acquisition">Date</th>
! 						<th class="acquisition">&nbsp;</th>
  					</tr>
! 					<!-- TMPL_LOOP name="loop_basket" -->
! 						<tr>
! 							<td><!-- TMPL_VAR name="basketno" --></a></td>
! 							<td><TMPl_VAR name="total"></td>
! 							<td><!-- TMPL_VAR name="authorisedby" --></td>
! 							<td><!-- TMPL_VAR name="creationdate" --></td>
! 							<td>
! 								<!-- TMPL_IF name="closedate" -->
! 									closed on <!-- TMPL_VAR name="closedate" -->
! 								<!-- TMPL_ELSE -->
! 									<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR name="basketno" -->" class="button acquisition">modify</a>
! 								<!-- /TMPL_IF -->
! 							</td>
! 						</tr>
! 					<!-- /TMPL_LOOP -->
! 				</table>
! 		</tr>
! 	<!-- /TMPL_LOOP -->
! 	</table>
! 	</div>
! 	<a class="button acquisition" href="supplier.pl?supplerid=0">Add supplier</a>
! </div>
  <!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->





More information about the Koha-cvs mailing list