[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en about.t...

paul poulain paul at koha-fr.org
Fri Mar 9 16:16:32 CET 2007


CVSROOT:	/sources/koha
Module name:	koha
Changes by:	paul poulain <tipaul>	07/03/09 15:16:32

Removed files:
	koha-tmpl/intranet-tmpl/default/en: about.tmpl auth.tmpl 
	                                    bookcount.tmpl 
	                                    boraccount.tmpl charges.tmpl 
	koha-tmpl/intranet-tmpl/default/en/acqui: acqui-home.tmpl 
	                                          acquire.tmpl 
	                                          basket.tmpl 
	                                          histsearch.tmpl 
	                                          lateorders.tmpl 
	                                          newbasket2.tmpl 
	                                          newbiblio.tmpl 
	                                          order.tmpl 
	                                          recieveorder.tmpl 
	                                          recieve.tmpl 
	                                          suggestion-select.tmpl 
	                                          supplier.tmpl 

Log message:
	rel_3_0 moved to HEAD (removing useless file)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/about.tmpl?cvsroot=koha&r1=1.14&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/auth.tmpl?cvsroot=koha&r1=1.8&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/bookcount.tmpl?cvsroot=koha&r1=1.6&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/boraccount.tmpl?cvsroot=koha&r1=1.11&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/charges.tmpl?cvsroot=koha&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acqui-home.tmpl?cvsroot=koha&r1=1.15&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/acquire.tmpl?cvsroot=koha&r1=1.15&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl?cvsroot=koha&r1=1.25&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/histsearch.tmpl?cvsroot=koha&r1=1.7&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl?cvsroot=koha&r1=1.4&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbasket2.tmpl?cvsroot=koha&r1=1.15&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/newbiblio.tmpl?cvsroot=koha&r1=1.22&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/order.tmpl?cvsroot=koha&r1=1.22&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieveorder.tmpl?cvsroot=koha&r1=1.10&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/recieve.tmpl?cvsroot=koha&r1=1.14&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/suggestion-select.tmpl?cvsroot=koha&r1=1.6&r2=0
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/default/en/acqui/supplier.tmpl?cvsroot=koha&r1=1.13&r2=0

Patches:
Index: about.tmpl
===================================================================
RCS file: about.tmpl
diff -N about.tmpl
--- about.tmpl	4 May 2005 08:58:30 -0000	1.14
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,82 +0,0 @@
-<!-- TMPL_INCLUDE NAME="about-top.inc" -->
-
-<div id="mainbloc">
-	<!-- TMPL_VAR NAME="about" -->
-	<h1>Data about the current version of Koha for bug reports (or general interest).</h1>
-	<div id="bloc25">
-		<h2>Server information</h2>
-		<p><label class="label100">Koha version</label><!-- TMPL_VAR ESCAPE=HTML name="kohaVersion" --></p>
-		<p><label class="label100">OS version ('uname -a')</label><!-- TMPL_VAR ESCAPE=HTML name="osVersion" --></p>
-		<p><label class="label100">Perl version</label><!-- TMPL_VAR ESCAPE=HTML name="perlVersion" --></p>
-		<p><label class="label100">MySQL version</label><!-- TMPL_VAR ESCAPE=HTML name="mysqlVersion" --></p>
-		<p><label class="label100">Apache version</label><!-- TMPL_VAR ESCAPE=HTML name="apacheVersion" --></p>
-	</div>
-	<div id="bloc25">
-		<h2>Special thanks to the following libraries</h2>
-		<p><b>Horowhenua Library Trust</b>, New Zealand, and Rosalie Blake, Head of Libraries, (Koha 1.0)</p>
-		<p>The <b>Nelsonville Public Library</b>, USA, Ohio (MARC support funding)</p>
-		<p><b>EMN (Ecole des Mines de Nantes)</b>, France (Suggestion, stats modules and improved ldap support funding)</p>
-		<p><b>ENSMP (Ecole Nationale Supérieure des Mines de Paris)</b>, France (biblio frameworks, MARC authorities, OPAC basket, Serials support funding)</p>
-	</div>
-	<div id="bloc25">
-		<h2>Core team for 2.2</h2>
-		<p><b>Rachel Hamilton-Williams</b>, Kaitiaki</p>
-		<p><b>Paul Poulain</b>, 2.2 release manager (MARC developer)</p>
-		<p>Stephen Hedges, Owen Leonard, Joshua Ferraro (<b>Nelsonville Public Library</b>)</p>
-		<p><b>Katipo Communications</b> (Koha 1.0 developers)</p>
-		<ul>
-			<p>Rachel Hamilton-Williams, General Manager (Webmistress)</p>
-			<p>Chris Cormack, 1.2 release manager</p>
-			<p>and Simon Blake, Amanda Atkins, Operations Manager, Olwen Williams, Finlay Thompson,</p>
-			<p>Gynn Lomax, Richard Anderson, Jeremy Blake, Rebecca Holden, Olive T. Canine</p>
-		</ul>
-		<p>Emiliano Marmonti, Matías Veleda & Sebastian Catañeda <b>La Plata University, Argentina</b> (barcode printing)</p>
-		<p>MJ Ray and <b>Turo Technology LLP</b>, (quality control, installer &amp; updater, 2.0 release maintainer)</p>
-		<p>Nicholas Rosasco, (Documentation Compiler)</p>
-		<p>Mike Hansen</p>
-		<p><b>Pate Eyler</b> (Kaitiaki from 2002 to 2004)</p>
-	</div>
-	<div id="bloc25">
-	<h2>Thanks to</h2>
-					<p>Adam Thick</p>
-					<p>Andrew Hooper</p>
-					<p>Al Banks</p>
-					<p>Ambrose Li (translation tool)</p>
-					<p>Andrew Arensburger (the small &amp; great C4::Context module)</p>
-					<p>Benedykt P. Barszcz (Polish for 2.0)</p>
-					<p>Brig C. McCoy</p>
-					<p>Daniel Holth</p>
-					<p>David Strainchamps</p>
-					<p>Dorian Meid (German translation)</p>
-					<p>doXulting (Matthieu Branlat) OPAC basket</p>
-					<p>Ed Summers (Some code and Perl packages like MARC::Record)</p>
-					<p>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</p>
-					<p>Florian Bischof</p>
-					<p>Francisco M. Marzoa Alonso</p>
-					<p>Glen Stewart</p>
-					<p>Henri-Damien Laurent</p>
-					<p>Jo Ransom</p>
-					<p>Kip DeGraaf</p>
-					<p>Marco Gaiarin</p>
-					<p>Md. Aftabuddin</p>
-					<p>Michaes Herman</p>
-					<p>Mike Johnson</p>
-					<p>Mike Mylonas</p>
-					<p>Nicolas Morin (French Translation in 2.0)</p>
-					<p>Pawel Skuza (Polish for 1.2)</p>
-					<p>Regula Sebastiao</p>
-					<p>Roger Buck</p>
-					<p>Ron Wickersham</p>
-					<p>Sebastiaan Durand</p>
-					<p>Steve Tonnesen (early MARC work, Virtual Bookshelves concept, KohaCD)</p>
-					<p>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</p>
-	</div>
-	<div id="bloc25">
-	<h2>Translation</h2>
-		<p><label>French</label>Pascale Nalon (ENSMP) and Jean Yves Lemaire (Chatel Saint Germain)</p>
-		<p><label>Chinese</label>Ambrose Li</p>
-		<p><label>Spanish</label>Andres Tarallo</p>
-		<p><label>Italian</label>Giuseppe Angilella</p>
-	</div>
-</div>
-<!-- TMPL_INCLUDE NAME="about-bottom.inc" -->

Index: auth.tmpl
===================================================================
RCS file: auth.tmpl
diff -N auth.tmpl
--- auth.tmpl	19 Jul 2004 21:41:29 -0000	1.8
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,49 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<!-- TMPL_IF NAME="nopermission" -->
-<!-- This is what is displayed if user doesn't have permission -->
-<h2>Sorry, Koha doesn't think you have permission for this page.</h2>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="timed_out" -->
-<!-- This is what is displayed if login has timed out -->
-<h2>Sorry, your session has timed out.  Please login again.</h2>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="different_ip" -->
-<!-- This is what is displayed if user's IP has changed -->
-<h2>You are accessing Koha from a different ip address! Please login again.</h2>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF NAME="invalid_username_or_password" -->
-<!-- This is what is displayed if the username or password doesn't work -->
-<h2>You entered an incorrect username or password.  Please try again.</h2>
-<!-- /TMPL_IF -->
-
-
-<!-- TMPL_IF NAME="loginprompt" -->
-<!-- login prompt time-->
-
-
-<form action="<!-- TMPL_VAR NAME="url" -->" method="post">
-<!-- TMPL_LOOP NAME="INPUTS" -->
-  <input type="hidden" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->">
-<!-- /TMPL_LOOP -->
-<table border="0" cellpadding="10" cellspacing="0" width="60%" align="center">
-    <tr><td align="center" valign="top">
-
-    <table border="0" bgcolor="#dddddd" cellpadding="10" cellspacing="0">
-    <tr><th colspan="2"><font size="+2">Koha Login</font></th></tr>
-    <tr><td>Card number:</td><td><input name="userid"></td></tr>
-    <tr><td>Password:</td><td><input type="password" name="password"></td></tr>
-    <tr><td colspan="2" align="center"><input type="submit" value="login"></td></tr>
-    </table>
-    </td><td align="center" valign="top">
-
-
-    </td></tr>
-</table>
-</form>
-
-
-<!-- /TMPL_IF -->

Index: bookcount.tmpl
===================================================================
RCS file: bookcount.tmpl
diff -N bookcount.tmpl
--- bookcount.tmpl	19 Jul 2004 21:41:29 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-<!-- TMPL_INCLUDE Name="reports-top.inc" -->
-<h1><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="bib" -->&amp;type=intra"> <!-- TMPL_VAR NAME="title" --> (<!-- TMPL_VAR NAME="author" -->)</a></h1><p>&nbsp;</p>
-
-<table  cellspacing="0"  cellpadding="5" border="1" width="440">
-	<tr valign="top">
-		<td  bgcolor="#99cc33" background="/images/background-mem.gif">
-			<b>BARCODE <!-- TMPL_VAR NAME="barcode" --></b>
-		</td>
-	</tr>
-	<tr valign="top">
-		<td width="440">
-
-		<b>Home Branch: </b> <!-- TMPL_VAR NAME="homebranch" --> <br>
-		<b>Current Branch: </b> <!-- TMPL_VAR NAME="holdingbranch" --><br>
-		<b>Date arrived at current branch: </b> <!-- TMPL_VAR NAME="lastdate" --> <br>
-		<b>Number of issues since the above date:</b> <!-- TMPL_VAR NAME="count" --> <br>
-
-		<table cellspacing="0" cellpadding="5" border="1" width="440">
-			<tr>
-				<th>Branch</th>
-				<th>No. of Issues</th>
-				<th>Last seen at branch</th>
-			</tr>
-			<!-- TMPL_LOOP Name="branchloop" -->
-				<tr>
-					<td> <b> <!-- TMPL_VAR NAME="branchname" --> </b></td>
-					<td> <b> <!-- TMPL_VAR NAME="issues" --> </b></td>
-					<td> <b> <!-- TMPL_VAR NAME="seen" --> </b></td>
-				</tr>
-			<!-- /TMPL_LOOP -->
-		</table>
-		</td>
-	</tr>
-</table>
-
-<!-- TMPL_INCLUDE Name="reports-bottom.inc" -->

Index: boraccount.tmpl
===================================================================
RCS file: boraccount.tmpl
diff -N boraccount.tmpl
--- boraccount.tmpl	20 Jun 2005 14:21:39 -0000	1.11
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-<!-- TMPL_INCLUDE NAME="members-top.inc" -->
-<div id="mainbloc">
-	<!-- The manual invoice and credit buttons -->
-	
-	<h1>Account for <a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></h1><P>
-	<a class="button" href="/cgi-bin/koha/maninvoice.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Invoice</a>
-	&nbsp;
-	<a class="button" href="/cgi-bin/koha/mancredit.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->">Create Manual Credit</a>
-	<!-- The table with the account items -->
-	
-	<table>
-	
-	<tr>
-		<th>FINES &amp; CHARGES</th>
-		<th>AMOUNT</th>
-		<th>STILL OWING</th>
-	</tr>
-	
-	<!-- TMPL_LOOP NAME="accounts" -->
-	
-		<tr>
-		<td><!-- TMPL_VAR NAME="date" --> <!-- TMPL_VAR NAME="description" --><!-- TMPL_IF NAME="printtitle" --> <!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF --></td>
-		<td><!-- TMPL_VAR NAME="amount" --></td>
-		<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
-		</tr>
-	
-	<!-- /TMPL_LOOP -->
-	
-	<tr>
-		<th>Total Due</th>
-		<th colspan="2"><!-- TMPL_VAR NAME="total" --></th>
-	</tr>
-	
-	</table>
-	
-	<!-- endmenu (member) -->
-</div>
-<!-- TMPL_INCLUDE NAME="members-bottom.inc" -->
-

Index: charges.tmpl
===================================================================
RCS file: charges.tmpl
diff -N charges.tmpl
--- charges.tmpl	19 Jul 2004 21:41:29 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-<html>
-
-<!-- TMPL_VAR NAME="startmenuissue" -->
-
-<p>
-Each box needs to be filled in with fine,time to start charging,charging cycle<br>
-eg 1,7,7 = $1 fine, after 7 days, every 7 days.<p>
-
-<table>
-  <tr bgcolor="white">
-    <!-- TMPL_LOOP NAME="firstrowloop" -->
-      <td><!-- TMPL_VAR NAME="description" --></td>
-    <!-- /TMPL_LOOP -->
-  </tr>
-  <form action="/cgi-bin/koha/updatecharges.pl" method="post">
-  <!-- TMPL_LOOP NAME="tablebodyloop" -->
-    <tr bgcolor="whitw">
-      <td><!-- TMPL_VAR NAME="description" --></td>
-      <!-- TMPL_LOOP NAME="rowloop" -->
-        <td><input type="text" name="<!-- TMPL_VAR NAME="name" -->" value="<!-- TMPL_VAR NAME="value" -->" size="6"></td>
-      <!-- /TMPL_LOOP -->
-    </tr>
-  <!-- /TMPL_LOOP -->
-</table>
-
-<input type="submit">
-</form>
-
-<!-- TMPL_VAR NAME="endmenuissue" -->
-
-</body>
-</html>
\ No newline at end of file

Index: acqui/acqui-home.tmpl
===================================================================
RCS file: acqui/acqui-home.tmpl
diff -N acqui/acqui-home.tmpl
--- acqui/acqui-home.tmpl	20 Jun 2005 14:13:12 -0000	1.15
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,90 +0,0 @@
-<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
-<div id="mainbloc">
-
-<h1 class="acquisition">Acquisitions</h1>
-<div id="bloc25">
-	<h2 class="acquisition">Start, receive, modify order</h2>
-	<!-- TMPL_IF name="nobudget" -->
-		<p class="problem">You must define a budget in parameters</p>
-	<!-- TMPL_ELSE -->
-		<form action="/cgi-bin/koha/acqui/order.pl" method="post">
-			Supplier name : <input type="text"  size="25"   name="supplier">
-			<input type="submit" class="button acquisition" value="OK">
-		</form>
-	<p>or <a href="histsearch.pl" class="button acquisition">Search order history</a></p>
-	<!-- /TMPL_IF -->
-</div>
-
-<!-- currencies-->
-<div id="bloc25">
-	<form action="/cgi-bin/koha/currency.pl">
-	<input type="hidden" name="type" value="change">
-	<h2 class="acquisition">exchange rates</h2>
-	<!-- TMPL_LOOP NAME="loop_currency" -->
-		<p>
-			<label><!-- TMPL_VAR NAME="currency" --></label>
-			<input type="text"  size="10"  name="<!-- TMPL_VAR NAME="currency" -->" value=<!-- TMPL_VAR NAME="rate" -->>
-		</p>
-	<!-- /TMPL_LOOP -->
-	<input type="submit" value="Save" class="button acquisition">
-</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">
-	<h2 class="acquisition">budgets and bookfunds</h2>
-	<!-- TMPL_IF name="nobudget" -->
-		<p class="problem">You must define a budget in parameters</p>
-	<!-- TMPL_ELSE -->
-		<table class="noborder">
-			<tr>
-				<th class="acquisition">Budgets</th>
-				<th class="acquisition">Total</th>
-				<th class="acquisition">Spent</th>
-				<th class="acquisition">Comtd</th>
-				<th class="acquisition">Avail</th>
-			</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>
-				<th class="acquisition" align="right">Total</th>
-				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="total" --></th>
-				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totspent" --></th>
-				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totcomtd" --></th>
-				<th class="acquisition" align="right"><!-- TMPL_VAR NAME="totavail" --></th>
-			</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>
-	<!-- /TMPL_IF -->
-</div>
-
-<div id="bloc25">
-	<h2 class="acquisition">HELP Ordering</h2>
-	<ul>
-		<p>To start an acquisition, whether an order, local purchase or donation first search on the supplier, Add a new one if needed.</p>
-		<p>Then select a previous shopping basket or create a new one. Note the basket will be attached to the user you've logged to </p>
-		<p>To order an item you need to establish whether a biblio already exists for it, and either add an item, or set up a new biblio then add the item.</p>
-		<p>To close off a shopping basket click on "view shopping baskets" or search above, and then click on "confirm basket".</p>
-	</ul>
-</div>
-
-</div>
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acqui/acquire.tmpl
===================================================================
RCS file: acqui/acquire.tmpl
diff -N acqui/acquire.tmpl
--- acqui/acquire.tmpl	2 Dec 2004 16:40:12 -0000	1.15
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,123 +0,0 @@
-<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
-
-<div id="mainbloc">
-<h1 class="acquisition">Receipt Summary for: <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i></h1>
-
-	<!-- TMPL_IF name="count" -->
-		<form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
-		<h1 class="acquisition"><!-- TMPL_VAR NAME="ordernumber" --> - Receive Order</h1>
-		Shopping Basket For: <!-- TMPL_VAR NAME="name" -->
-		<br> Order placed: <!-- TMPL_VAR NAME="date" -->
-		<div id="bloc25">
-				<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>
-		<div id="bloc25">
-			<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_IF name="unitprice"--><!-- TMPL_VAR NAME="unitprice" --><!-- TMPL_ELSE --><!-- TMPL_VAR name="rrp" --><!-- /TMPL_IF -->">
-			</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"> (that all costs are for 1 item)
-				<!-- 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>
-		</form>
-	<!-- TMPL_ELSE -->
-		<table>
-		<tr>
-			<th class="acquisition">Basket</th>
-			<th class="acquisition">ISBN</th>
-			<th class="acquisition">TITLE</th>
-			<th class="acquisition">AUTHOR</th>
-			<th class="acquisition">Qty</th>
-			<th class="acquisition">Received</th>
-		</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" -->&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>
-				<td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-		</table>
-	<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acqui/basket.tmpl
===================================================================
RCS file: acqui/basket.tmpl
diff -N acqui/basket.tmpl
--- acqui/basket.tmpl	5 Sep 2006 21:30:58 -0000	1.25
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,151 +0,0 @@
-<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
-
-<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?supplierid=<!-- TMPL_VAR NAME="booksellerid" -->"><!-- TMPL_VAR NAME="name" --></a></h1><br />
-	<!-- TMPL_UNLESS name="closedate" -->
-		<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>
-			<!-- TMPL_IF name="closedate" -->
-				Closed on <!-- TMPL_VAR name="closedate" -->
-			<!-- TMPL_ELSE -->
-				<a href="/cgi-bin/koha/acqui/order.pl?op=close&amp;basket=<!-- TMPL_VAR NAME="basketno" -->&supplier=<!-- TMPL_VAR name="booksellerid" -->" class="button acquisition">Close</a>
-			<!-- /TMPL_IF -->
-		</div>
-	<!-- /TMPL_UNLESS -->
-	<div id="bloc25" style="align:right">
-		<p><!-- TMPL_VAR name="name" --></p>
-		<p><!-- TMPL_VAR name="address1" --></p>
-		<p><!-- TMPL_VAR name="address2" --></p>
-		<p><!-- TMPL_VAR name="address3" --></p>
-		<p><!-- TMPL_VAR name="address4" --></p>
-	</div>
-	<div id="bloc100">
-	<h2 class="acquisition">Order</h2>
-	<!-- TMPL_IF name="books_loop" -->
-		<table>
-			<tr valign="top" bgcolor="#ffdf61">
-				<th class="acquisition doNotPrint">Order</th>
-				<th class="acquisition">Publisher<a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=biblioitems.publishercode" class="acquisition">[order]</a></th>
-				<th class="acquisition">Title</th>
-				<th class="acquisition doNotPrint">rrp</th>
-				<th class="acquisition">est</th>
-				<th class="acquisition">Qty</th>
-				<th class="acquisition">Total</th>
-				<th class="acquisition doNotPrint">Fund <a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->&order=aqorderbreakdown.bookfundid,biblioitems.publishercode">[order]</a></th>
-				<!-- TMPL_IF name="active" -->
-				<th class="acquisition doNotPrint">Remove</th>
-				<th class="acquisition doNotPrint">Edit</th>
-				<!-- /TMPL_IF -->
-			</tr>
-			<!-- TMPL_LOOP NAME="books_loop" -->
-				<!-- TMPL_IF name="odd" -->
-				<tr class="hilighted">
-				<!-- TMPL_ELSE -->
-				<tr>
-				<!-- /TMPL_IF -->
-					<td class="doNotPrint"><!-- TMPL_VAR NAME="ordernumber" --></td>
-					<td><!-- TMPL_VAR NAME="publishercode" --></td>
-					<!-- TMPL_IF name="closedate" -->
-						<td>
-							<b><!-- TMPL_VAR NAME="title" --></b><br/>
-								<!-- TMPL_VAR NAME="author" -->
-								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
-								<!-- TMPL_IF name="notes" --><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i></p><!-- /TMPL_IF -->
-						</td>
-					<!-- TMPL_ELSE -->
-						<td>
-							<a href="newbiblio.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->"><!-- TMPL_VAR NAME="title" --></a><br/>
-								<!-- TMPL_VAR NAME="author" -->
-								<!-- TMPL_IF name="isbn"-->- <!-- TMPL_VAR name="isbn" --><!-- /TMPL_IF -->
-								<!-- TMPL_IF name="notes" --></p><p class="doNotPrint"><i><!--TMPL_VAR name="notes" --></i><!-- /TMPL_IF -->
-						</td>
-					<!-- /TMPL_IF -->
-					<td class="doNotPrint number"><p><!-- TMPL_VAR NAME="rrp" --></p></td>
-					<td class="number"><p><!-- TMPL_VAR NAME="ecost" --></p></td>
-					<td class="number"><p><!-- TMPL_VAR NAME="quantity" --></p></td>
-					<td class="number"><p><!-- TMPL_VAR NAME="line_total" --></p></td>
-					<td class="doNotPrint"><p><!-- TMPL_VAR NAME="bookfundid" --></p></td>
-					<!-- TMPL_IF name="active" -->
-						<td class="doNotPrint">
-							<a href="addorder.pl?ordnum=<!-- TMPL_VAR NAME="ordernumber" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&quantity=0&biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
-								<img src="/intranet-tmpl/default/images/edittrash.png" alt="Remove from basket" title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
-							</a>
-						</td>
-						<td class="doNotPrint">
-							<a href="newbiblio.pl?sub=&booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&biblio=<!-- TMPL_VAR NAME="biblionumber" -->&ordnum=<!-- TMPL_VAR NAME="ordernumber" --><!--TMPL_IF name="closedate"-->&close=1<!--/TMPL_IF -->">
-								<img src="/intranet-tmpl/default/images/fileopen.png" alt="Edit" title="Remove from basket" width="32" hspace="0" vspace="0" border="0">
-							</a>
-						</td>
-					<!-- /TMPL_IF -->
-				</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="2" class="acquisition">
-					&nbsp;
-				</td>
-				<td class="acquisition number">
-					<p>Sub total</p>
-					<p>GST</p>
-					<p>TOTAL (<!-- TMPL_VAR NAME="currency" -->)</p>
-				</td>
-				<td class="acquisition number">
-					<p><!-- TMPL_VAR NAME="sub_total_est" --></p>
-					<p><!-- TMPL_VAR NAME="gist_est" --></p>
-					<p><!-- TMPL_VAR NAME="grand_total_est" --></p>
-				</td>
-				<td class="acquisition">
-					<p>&nbsp;</p>
-					<p>&nbsp;</p>
-					<p>&nbsp;</p>
-				</td>
-				<td class="acquisition number">
-					<p><!-- TMPL_VAR name="qty_total" --></p>
-					<p>&nbsp;</p>
-					<p>&nbsp;</p>
-				</td>
-				<td class="acquisition number">
-					<p><!-- TMPL_VAR NAME="sub_total" --></p>
-					<p><!-- TMPL_VAR NAME="gist" --></p>
-					<p><!-- TMPL_VAR NAME="grand_total" --></p>
-				</td>
-				<td class="acquisition">
-					<p>&nbsp;</p>
-					<p>&nbsp;</p>
-					<p>&nbsp;</p>
-				</td>
-			</tr>
-		</table>
-	<!-- TMPL_ELSE -->
-		<p>Basket empty</p>
-	<!-- /TMPL_IF -->
-	</div>
-	<!-- TMPL_IF name="active" -->
-		<!-- TMPL_UNLESS name="closedate" -->
-		<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" -->">
-				<input type="hidden" name="acq_search" value="1">
-				<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" -->&amp;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" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">
-						New biblio
-					</a>
-				</p>
-			</form>
-		</div>
-		<!-- /TMPL_UNLESS -->
-	<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acqui/histsearch.tmpl
===================================================================
RCS file: acqui/histsearch.tmpl
diff -N acqui/histsearch.tmpl
--- acqui/histsearch.tmpl	6 Jan 2006 16:39:39 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,252 +0,0 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
-<div id="mainbloc">
-	<h1 class="acquisition">Order search</h1>
-	<p class="resultcount"><!-- TMPL_VAR Name ="numresults" --> orders were found.
-	 </p>
-	<table>
-		<tr>
-			<th class="acquisition">&nbsp;</th>
-			<th class="acquisition">Supplier</th>
-			<th class="acquisition">Title/Author</th>
-			<th class="acquisition">Placed on</th>
-			<th class="acquisition">Recieved on</th>
-			<th class="acquisition">Quantity ordered</th>
-			<th class="acquisition">Quantity received</th>
-			<th class="acquisition">Unit cost</th>
-			<th class="acquisition">&nbsp;</th>
-		</tr>
-		<tr>
-			<form action="/cgi-bin/koha/acqui/histsearch.pl" method="get">
-				<th class="acquisition">
-					Filter on
-				</th>
-				<th class="acquisition">
-					<input type="text" name="name" value="<!-- TMPL_VAR name="name" -->">
-				</th>
-				<th class="acquisition">
-					<input type="text" name="title" value="<!-- TMPL_VAR name="title"-->">/
-					<input type="text" name="author" value="<!-- TMPL_VAR name="author" -->">
-				</th>
-				<th class="acquisition">
-					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
-					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
-					<script language="JavaScript" type="text/javascript">
-						function validate1(date) {
-							var day = date.getDate();
-							var month = date.getMonth() + 1;
-							var year = date.getFullYear();
-							var weekDay = date.getDay();
-							var dayMonth = month + '-' + day;
-							var dateString = year + '-' + month + '-' + day;
-							var dateTo = document.getElementById('to').value.split("-");
-							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-							if (date > limitDate) {
-								return true;
-							} else {
-								return false;
-							}
-						}
-						Calendar.setup(
-							{
-								inputField : "from",
-								ifFormat : "%Y-%m-%d",
-								button : "openCalendarFrom",
-								disableFunc : validate1,
-								dateStatusFunc : validate1
-							}
-						);
-					</script>
-					<br/>
-					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text">
-					<script type="text/javascript">
-						function validate2(date) {
-							var day = date.getDate();
-							var month = date.getMonth() + 1;
-							var year = date.getFullYear();
-							var weekDay = date.getDay();
-							var dayMonth = month + '-' + day;
-							var dateString = year + '-' + month + '-' + day;
-							var dateFrom = document.getElementById('from').value.split("-");
-							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-							if (limitDate > date) {
-								return true;
-							} else {
-								return false;
-							}
-						}
-
-						Calendar.setup(
-							{
-								inputField : "to",
-								ifFormat : "%Y-%m-%d",
-								button : "openCalendarTo",
-								disableFunc : validate2,
-								dateStatusFunc : validate2
-							}
-						);
-					</script>
-				</th>
-				<th class="acquisition">
-					From <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
-					<input type="text" readonly="readonly" size="10" id="from" name="fromplacedon" value="<!-- TMPL_VAR name="from_placed_on" -->">
-					<script language="JavaScript" type="text/javascript">
-						function validate1(date) {
-							var day = date.getDate();
-							var month = date.getMonth() + 1;
-							var year = date.getFullYear();
-							var weekDay = date.getDay();
-							var dayMonth = month + '-' + day;
-							var dateString = year + '-' + month + '-' + day;
-							var dateTo = document.getElementById('to').value.split("-");
-							var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
-							if (date > limitDate) {
-								return true;
-							} else {
-								return false;
-							}
-						}
-						Calendar.setup(
-							{
-								inputField : "from",
-								ifFormat : "%Y-%m-%d",
-								button : "openCalendarFrom",
-								disableFunc : validate1,
-								dateStatusFunc : validate1
-							}
-						);
-					</script>
-					To <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
-					<input readonly="readonly" size="10" id="to" name="toplacedon" value="<!-- TMPL_VAR name="to_placed_on" -->" type="text">
-					<script type="text/javascript">
-						function validate2(date) {
-							var day = date.getDate();
-							var month = date.getMonth() + 1;
-							var year = date.getFullYear();
-							var weekDay = date.getDay();
-							var dayMonth = month + '-' + day;
-							var dateString = year + '-' + month + '-' + day;
-							var dateFrom = document.getElementById('from').value.split("-");
-							var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
-							if (limitDate > date) {
-								return true;
-							} else {
-								return false;
-							}
-						}
-
-						Calendar.setup(
-							{
-								inputField : "to",
-								ifFormat : "%Y-%m-%d",
-								button : "openCalendarTo",
-								disableFunc : validate2,
-								dateStatusFunc : validate2
-							}
-						);
-					</script>
-				</th>
-				<th class="acquisition">
-					&nbsp;
-				</th>
-				<th class="acquisition">
-					&nbsp;
-				</th>
-				<th class="acquisition">
-					&nbsp;
-				</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>
-				<!-- TMPL_IF name="toggle" -->
-					<td class="hilighted">
-				<!-- TMPL_ELSE -->
-					<td>
-				<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="count" -->
-				</td>
-				<!-- TMPL_IF name="toggle" -->
-					<td class="hilighted">
-				<!-- TMPL_ELSE -->
-					<td>
-				<!-- /TMPL_IF -->
-					<!-- TMPL_VAR NAME="name" -->
-				</td>
-				<!-- TMPL_IF name="toggle" -->
-					<td class="hilighted">
-				<!-- TMPL_ELSE -->
-					<td>
-				<!-- /TMPL_IF -->
-					<p><a href="basket.pl?basket=<!-- TMPL_VAR name="basketno" -->"><!-- TMPL_VAR NAME="title" --></a></p>
-					<p><!-- TMPL_VAR NAME="author" --></p>
-				</td>
-				<!-- TMPL_IF name="toggle" -->
-					<td class="hilighted">
-				<!-- TMPL_ELSE -->
-					<td>
-				<!-- /TMPL_IF -->
-					<!-- TMPL_VAR name="creationdate" -->
-				</td>
-				<!-- TMPL_IF name="toggle" -->
-					<td class="hilighted">
-				<!-- TMPL_ELSE -->
-					<td>
-				<!-- /TMPL_IF -->
-					<!-- TMPL_VAR name="datereceived" -->
-				</td>
-				<!-- TMPL_IF name="toggle" -->
-					<td class="hilighted number">
-				<!-- TMPL_ELSE -->
-					<td class="number">
-				<!-- /TMPL_IF -->
-					<!-- TMPL_VAR name="quantity" -->
-				</td>
-				<!-- TMPL_IF name="toggle" -->
-					<td class="hilighted number">
-				<!-- TMPL_ELSE -->
-					<td class="number">
-				<!-- /TMPL_IF -->
-					<!-- TMPL_VAR name="quantityreceived" -->
-				</td>
-				<!-- TMPL_IF name="toggle" -->
-					<td class="hilighted number">
-				<!-- TMPL_ELSE -->
-					<td class="number">
-				<!-- /TMPL_IF -->
-					<!-- TMPL_VAR name="ecost" -->
-				</td>
-				<!-- TMPL_IF name="toggle" -->
-					<td class="hilighted">
-				<!-- TMPL_ELSE -->
-					<td>
-				<!-- /TMPL_IF -->
-					&nbsp;
-				</td>
-
-			</tr>
-		<!-- /TMPL_LOOP -->
-		<tr>
-			<th class="acquisition">&nbsp;</th>
-			<th class="acquisition">&nbsp;</th>
-			<th class="acquisition">&nbsp;</th>
-			<th class="acquisition">&nbsp;</th>
-			<th class="acquisition">&nbsp;</th>
-			<th class="acquisition"><!-- TMPL_VAR name="total_qty" --></th>
-			<th class="acquisition"><!-- TMPL_VAR name="total_qtyreceived" --></th>
-			<th class="acquisition"><!-- TMPL_VAR name="total_price" --></th>
-			<th class="acquisition">&nbsp;</th>
-		</tr>
-	</table>
-</div>
-
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: acqui/lateorders.tmpl
===================================================================
RCS file: acqui/lateorders.tmpl
diff -N acqui/lateorders.tmpl
--- acqui/lateorders.tmpl	6 Jan 2006 16:39:39 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,105 +0,0 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
-<div id="mainbloc">
-	<h1 class="acquisition"><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
-	<table>
-		<tr>
-			<th class="acquisition doNotPrint">Supplier</th>
-			<th class="acquisition">Order Date</th>
-			<th class="acquisition">Ordered for</th>
-			<th class="acquisition doNotPrint">Including Basket</th>
-			<th class="acquisition">Book information</th>
-			<th class="acquisition doNotPrint">Branch</th>
-			<th class="acquisition doNotPrint">Estimated Unit Price</th>
-			<th class="acquisition">Retailer Catalogue Unit Price</th>
-			<th class="acquisition">Quantity</th>
-			<th class="acquisition">Total cost</th>
-			<th class="acquisition doNotPrint">Budget</th>
-			<th class="acquisition doNotPrint">&nbsp;</th>
-		</tr>
-		<tr class="doNotPrint">
-			<form action="lateorders.pl" method="post">
-				<td class="doNotPrint">
-					<!-- TMPL_VAR name="CGIsupplier" -->
-				</td>
-				<td> &nbsp;</td>
-				<td align="center" class="doNotPrint">
-					<input align="right" size="4" maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->" > days
-				</td>
-				<td colspan="2">
-					&nbsp;
-				</td>
-				<td class="doNotPrint">
-					<!-- TMPL_VAR name="CGIbranch" -->
-				</td>
-				<td colspan="5">
-					&nbsp;
-				</td>
-				
-				<td class="doNotPrint">
-					<input type="submit" value="filter" class="button acquisition">
-				</td>
-			</form>
-		</tr>
-		<!-- TMPL_LOOP name="lateorders" -->
-			<!--TMPL_IF Name="hilighted" --> <tr class="hilighted"> <!--TMPL_ELSE--> <tr> <!-- /TMPL_IF -->
-				<td class="doNotPrint">
-					<!-- TMPL_VAR name="supplier" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR name="orderdate" -->
-				</td>
-				<td class="number" align="right">
-					<!-- TMPL_VAR name="latesince" -->
-				</td>
-				<td align="center" class="doNotPrint">
-					<!-- TMPL_VAR name="basketno" -->
-				</td>
-				<td >
-					<b><!-- TMPL_VAR name="title" --></b>
-				<!-- TMPL_IF name="author" --><br/><i>Author:</i> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="publisher" --><br/><i>Published by:</i> <!-- TMPL_VAR NAME="publisher" --><!-- TMPL_IF name="publicationyear" --><i> in </i><!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
-				</td>
-				<td class="doNotPrint">
-					<!-- TMPL_VAR name="branch" -->
-				</td>
-				<td align="right" class="doNotPrint">
-					<!-- TMPL_VAR name="unitpricelib" -->
-				</td>
-				<td align="right">
-					<!-- TMPL_VAR name="unitpricesupplier" -->
-				</td>
-				<td align="right">
-					<!-- TMPL_VAR name="quantity" -->
-				</td>
-				<td align="right">
-					<!-- TMPL_VAR name="subtotal" -->
-				</td>
-				<td class="doNotPrint">
-					<!-- TMPL_VAR name="budget" -->
-				</td>
-				<td class="doNotPrint">
-					&nbsp;
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-		<tr> 
-				<th class="acquisition">
-					Total
-				</th>
-				<th class="acquisition" colspan="2">
-					&nbsp;
-				</th>
-				<th class="acquisition" class="doNotPrint"> &nbsp;</th>
-				<th class="acquisition"  colspan="5">
-					&nbsp;
-				</th>
-				
-				<th class="acquisition">
-					<!-- TMPL_VAR name="total" -->
-				</th>
-		</tr>
-	</table>
-</div>
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
-

Index: acqui/newbasket2.tmpl
===================================================================
RCS file: acqui/newbasket2.tmpl
diff -N acqui/newbasket2.tmpl
--- acqui/newbasket2.tmpl	5 Sep 2006 21:30:58 -0000	1.15
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,93 +0,0 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
-<div id="mainbloc">
-	<h1 class="acquisition">Shopping basket <!-- TMPL_VAR name="basketno" --> for: <!-- TMPL_VAR NAME="bookselname" --></h1>
-		<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&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?basketno=<!-- TMPL_VAR NAME="basketno" -->">
-		<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="basketno" value=<!-- TMPL_VAR NAME="basketno" -->>
-	<input type="hidden" name="acq_search" value="1">
-	<b>New Search: </b><input="text"  size="25"   name="search">
-	<input type="submit" value="Search" class="button acquisition">
-	</form>
-
-	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 <i><!-- TMPL_VAR NAME="dispnum" --></i> to <i><!-- TMPL_VAR NAME="offset2" --></i> displayed.
-	
-	<table>
-		<tr>
-			<th class="acquisition">TITLE</th>
-			<th class="acquisition">AUTHOR</th>
-			<th class="acquisition">&copy;</th>
-			<th class="acquisition">COUNT</th>
-			<th class="acquisition">LOCATION</th>
-		</tr>
-	
-	<!-- TMPL_LOOP NAME="loopresult" -->
-		<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;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;biblio=<!-- TMPL_VAR NAME="biblionumber" -->">
-					<!-- TMPL_VAR NAME="title" -->
-					</a>
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="author" -->
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="copyright" -->
-			</td>
-			<td>
-				<!-- TMPL_VAR NAME="itemcount" -->
-			</td>
-			<td>
-				<!-- TMPL_IF name="use-location-flags-p" -->
-				<!-- TMPL_IF name="location-only" --><!-- TMPL_VAR NAME="location-only" --><br><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="on-loan-p" -->On Loan<br><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="lost-p" -->Lost<br><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="mending-p" -->Mending<br><!-- /TMPL_IF -->
-				<!-- TMPL_IF name="in-transit-p" -->In Transit<br><!-- /TMPL_IF -->
-				<!-- TMPL_ELSE -->
-				<!-- TMPL_VAR NAME="location" -->
-				<!-- /TMPL_IF -->
-			</td>
-		</tr>
-	
-	<!-- /TMPL_LOOP -->
-	
-		<tr bgcolor="#ffdf61">
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				&nbsp;
-			</td>
-			<td>
-				&nbsp;
-			</td>
-		</tr>
-	</table>
-	
-	<!-- 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;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;search=<!-- TMPL_VAR NAME="title" -->&amp;author=<!-- TMPL_VAR NAME="author" -->">
-	Next
-	</a>
-	<!-- /TMPL_IF -->
-</div>
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->

Index: acqui/newbiblio.tmpl
===================================================================
RCS file: acqui/newbiblio.tmpl
diff -N acqui/newbiblio.tmpl
--- acqui/newbiblio.tmpl	6 Jan 2006 16:39:39 -0000	1.22
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,237 +0,0 @@
-<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
-<script language="javascript" type="text/javascript">
-
-<!--
-function update(f){
-  //collect values
-  quantity=f.quantity.value
-  if (quantity ==0) {
-  	alert("Quantity must be >0");
-  }
-  discount=f.discount.value
-  listinc=parseInt(f.listinc.value)
-  currency=f.currency.value
-  applygst=parseInt(f.applygst.value)
-  listprice=f.list_price.value
-  //  rrp=f.rrp.value
-  //  ecost=f.ecost.value  //budgetted cost
-  //  GST=f.GST.value
-  //  total=f.total.value
-  //make useful constants out of the above
-  exchangerate=f.elements[currency].value      //get exchange rate
-  gst_on=(!listinc && applygst);
-  //do real stuff
-  rrp=listprice*exchangerate;
-  ecost=rrp*(100-discount)/100
-  GST=0;
-  if (gst_on){
-    rrp=rrp*(1+<!-- TMPL_VAR NAME="gstrate" -->);
-    GST=ecost*(<!-- TMPL_VAR NAME="gstrate" -->);
-  }
-
-  total=(ecost+GST)*quantity
-
-  f.rrp.value=rrp;
-  f.ecost.value=ecost;
-  f.GST.value=GST;
-  f.total.value=total;
-  return true;
-}
-
-
-
-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>");
-}
-
-function check(f) {
-  quantity=f.quantity.value
-  title=f.title.value
-  if (title == "") {
-  	alert("Title can't be empty");
-	return false;
-  }
-  if (quantity ==0) {
-  	alert("Quantity must be >0");
-	return false;
-  }
-	document.frusin.submit();
-}
-
-//-->
-
-</script>
-<div id="mainbloc">
-	<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="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>
-			<!-- TMPL_IF name="biblio" -->
-				<input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->"><!-- TMPL_VAR NAME="title" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->">
-			<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label class="label100">Author</label>
-			<!-- TMPL_IF name="biblio" -->
-				<input type="hidden" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->"><!-- TMPL_VAR NAME="author" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="author" value="<!-- TMPL_VAR NAME="author" -->">
-			<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label class="label100"> Publisher</label>
-			<!-- TMPL_IF name="biblio" -->
-				<input type="hidden" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->"><!-- TMPL_VAR NAME="publishercode" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->">
-			<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label class="label100">Copyright Date</label>
-			<!-- TMPL_IF name="biblio" -->
-				<input type="hidden" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->"><!-- TMPL_VAR NAME="copyrightdate" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->">
-			<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label class="label100">Format</label>
-			<!-- TMPL_VAR NAME="CGIitemtype" -->
-		</p>
-		<p>
-			<label class="label100">ISBN</label>
-			<!-- TMPL_IF name="biblio" -->
-				<input type="hidden" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->"><!-- TMPL_VAR NAME="isbn" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->">
-			<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label class="label100">Series</label>
-			<!-- TMPL_IF name="biblio" -->
-				<input type="hidden" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->"><!-- TMPL_VAR NAME="seriestitle" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="series" value="<!-- TMPL_VAR NAME="seriestitle" -->">
-			<!-- /TMPL_IF -->
-		</p>
-		<p>
-			<label class="label100">Branch</label>
-			<!-- TMPL_VAR NAME="CGIbranch" -->
-		</p>
-	</div>
-	<div id="bloc25">
-		<h2 class="acquisition">Accounting details</h2>
-		<p>
-			<label class="label100">Quantity</label>
-			<!-- TMPL_IF name="close" -->
-				<input type="hidden" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->"><!-- TMPL_VAR NAME="quantity" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);">
-		  	<!--/TMPL_IF-->
-		</p>
-		<p>
-			<label class="label100">Bookfund</label>
-			<!-- TMPL_IF name="close" -->
-				<input type="hidden" size="20" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->"><!-- TMPL_VAR NAME="bookfundname" -->
-			<!-- TMPL_ELSE -->
-				<!-- TMPL_VAR NAME="CGIbookfund" -->
-		  	<!--/TMPL_IF-->
-		</p>
-		<p>
-			<label class="label100">Suppliers List Price</label>
-			<!-- TMPL_IF name="close" -->
-				<input type="hidden" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->"><!-- TMPL_VAR NAME="listprice" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)">
-		  	<!--/TMPL_IF-->
-		</p>
-		<p>
-			<label class="label100">Replacement Cost </label>
-			<!-- TMPL_IF name="close" -->
-				<input type="hidden" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->"><!-- TMPL_VAR NAME="rrp" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->">
-		  	<!--/TMPL_IF-->
-		</p>
-		<p>
-			<label class="label100">Budgeted Cost</label>
-			<input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
-		</p>
-		<p>
-			<label class="label100">Budgeted GST</label>
-			<input type="text" size="20" name="GST" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
-		</p>
-		<p>
-			<label class="label100"><b>BUDGETED TOTAL</b></label>
-			<input type="text" size="20" name="total" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
-		</p>
-		<p>
-			<label class="label100">Actual Cost</label>
-			<input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF-->>
-		</p>
-		<p>
-			<label class="label100">Invoice Number *</label>
-			<input type="text" size="20" name="invoice"  value="<!-- TMPL_VAR 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>
-			<!-- TMPL_IF Name="CGIsort1" -->
-				<!-- TMPL_VAR Name="CGIsort1" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->">
-			<!--/TMPL_IF -->
-		</p>
-		<p>
-			<label class="label100">Sort field 2</label>
-			<!-- TMPL_IF Name="CGIsort2" -->
-				<!-- TMPL_VAR Name="CGIsort2" -->
-			<!-- TMPL_ELSE -->
-				<input type="text" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->">
-			<!--/TMPL_IF -->
-		</p>
-		<p>
-			<input type="button" value="OK" class="button acquisition" onClick="check(this.form)">
-		</p>
-	</form>
-	</div>
-</div>
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acqui/order.tmpl
===================================================================
RCS file: acqui/order.tmpl
diff -N acqui/order.tmpl
--- acqui/order.tmpl	4 May 2005 08:52:50 -0000	1.22
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,65 +0,0 @@
-<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
-<div id="mainbloc">
-<h1 class="acquisition">You searched on <b>supplier <!-- TMPL_VAR name="supplier" -->,</b> <!-- TMPL_VAR name="count" --> results found</h1>
-<div id="bloc100">
-<table>
-<tr>
-	<th class="acquisition">Order</th>
-	<th class="acquisition">Receive</th>
-	<th class="acquisition">Company</th>
-	<th class="acquisition">&nbsp;</th>
-</tr>
-
-<!-- TMPL_LOOP name="loop_suppliers" -->
-	<tr valign="top">
-		<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="firstname" -->
-									<!-- TMPL_VAR name="surname" -->
-							</td>
-							<td><!-- TMPL_VAR NAME="creationdate" --></td>
-							<td>
-								<!-- TMPL_IF name="closedate" -->
-									closed on <!-- TMPL_VAR NAME="closedate" -->
-									<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
-								<!-- TMPL_ELSE -->
-									<!-- TMPL_IF name="active" -->
-										<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">modify</a>
-									<!-- TMPL_ELSE -->
-										<a href="/cgi-bin/koha/acqui/basket.pl?basket=<!-- TMPL_VAR NAME="basketno" -->" class="button acquisition">View</a>
-									<!-- /TMPL_IF -->
-								<!-- /TMPL_IF -->
-							</td>
-						</tr>
-					<!-- /TMPL_LOOP -->
-				</table>
-		</tr>
-	<!-- /TMPL_LOOP -->
-	</table>
-	</div>
-	<a class="button acquisition" href="supplier.pl?supplierid=0">Add supplier</a>
-</div>
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acqui/recieveorder.tmpl
===================================================================
RCS file: acqui/recieveorder.tmpl
diff -N acqui/recieveorder.tmpl
--- acqui/recieveorder.tmpl	12 Aug 2004 14:37:11 -0000	1.10
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-<!-- 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>
-			<label>Supplier Invoice Number</label>
-			<input type="text" size="20" name="invoice">
-		</p>
-		<p>
-			<label>GST</label>
-			<input type="text" size="20" name="gst">
-		</p>
-		<p>
-			<label>Freight</label>
-			<input type="text" size="20" name="freight">
-		</p>
-		<p>
-			<input type="submit" class="button acquisition" value="save">
-		</p>
-		</form>
-	</div>
-</div>
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acqui/recieve.tmpl
===================================================================
RCS file: acqui/recieve.tmpl
diff -N acqui/recieve.tmpl
--- acqui/recieve.tmpl	5 Sep 2006 22:24:10 -0000	1.14
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,80 +0,0 @@
-<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
-
-<div id="mainbloc">
-	<h1 class="acquisition">
-		<!-- TMPL_IF name="invoice" -->
-			Receipt Summary for <i><!-- TMPL_VAR NAME="name" --></i> Invoice <i><!-- TMPL_VAR NAME="invoice" --></i>
-		<!-- TMPL_ELSE -->
-			orders not yet recieved for <!-- TMPL_VAR NAME="name" -->
-		<!-- /TMPL_IF -->
-	</h1>
-	
-	<div id="bloc25">
-		Invoice: <!-- TMPL_VAR NAME="invoice" --><br>
-		Received By: <!-- TMPL_VAR NAME="user" --><br>
-		<!-- TMPL_VAR NAME="date" -->
-	</div>
-	
-	<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" -->">
-			<input type="hidden" name="invoice" value="<!-- TMPL_VAR NAME="invoice" -->">
-			<input type="hidden" name="acq_search" value="1">
-			
-			<b>Search ISBN or Title:</b> <input type="text" size="25" name="recieve">
-		</form>
-	<p>
-	<form action="" method="get" name="orderform">
-	
-	<table>
-		<tr>
-			<th class="acquisition">BASKET</th>
-			<th class="acquisition">ISBN</th>
-			<th class="acquisition">TITLE</th>
-			<th class="acquisition">AUTHOR</th>
-			<th class="acquisition">ACTUAL</th>
-			<th class="acquisition">P&amp;P</th>
-			<th class="acquisition">QTY</th>
-			<th class="acquisition">TOTAL</th>
-		</tr>
-		<!-- TMPL_VAR NAME="count" -->
-		<!-- TMPL_LOOP NAME="loop_orders" -->
-			<tr 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" -->&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>
-				<td></td>
-				<td><!-- TMPL_VAR NAME="quantityrecieved" --></td>
-				<td><!-- TMPL_VAR NAME="total" --></td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-		<tr bgcolor="white">
-			<th class="acquisition"></th>
-			<th class="acquisition"></th>
-			<th class="acquisition"></th>
-			<th class="acquisition">SUBTOTALS</th>
-			<th class="acquisition"><!-- TMPL_VAR NAME="totalprice" --></th>
-			<th class="acquisition"><!-- TMPL_VAR NAME="totalfreight" --></th>
-			<th class="acquisition"><!-- TMPL_VAR NAME="totalquantity" --></th>
-			<th class="acquisition"><!-- TMPL_VAR NAME="tototal" --></th>
-		</tr>
-		<tr>
-			<td colspan="5" rowspan=2  bgcolor="#ffdf61">
-			<b>HELP</b>
-				<p>The total at the bottom of the page should be within a few cents of the total for the invoice.</p>
-			</td>
-			<td colspan="2" align="right"><b>GST</b></td>
-			<td><!-- TMPL_VAR NAME="gst" --></td>
-		</tr>
-		<tr bgcolor="white">
-			<td colspan="2" align="right" ><b>TOTAL</b></td>
-			<td><!-- TMPL_VAR NAME="grandtot" --></td>
-		</tr>
-	</table>
-	</div>
-</div>
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->

Index: acqui/suggestion-select.tmpl
===================================================================
RCS file: acqui/suggestion-select.tmpl
diff -N acqui/suggestion-select.tmpl
--- acqui/suggestion-select.tmpl	26 Oct 2005 09:15:56 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,60 +0,0 @@
-<!-- TMPL_INCLUDE NAME="acquisitions-top.inc" -->
-<div id="mainbloc">
-	<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 action="/cgi-bin/koha/acqui/suggestion-select.pl" method="get">
-				<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="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
-				</td>
-				<td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-					<!-- TMPL_IF name="biblionumber" -->
-						<a href="newbiblio.pl?booksellerid=<!-- TMPL_VAR NAME="supplierid" -->&amp;basketno=<!-- TMPL_VAR NAME="basketno" -->&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;basketno=<!-- TMPL_VAR NAME="basketno" -->&amp;suggestionid=<!-- TMPL_VAR NAME="suggestionid" -->" class="button acquisition">Order</a>
-					<!-- /TMPL_IF -->
-				</td>
-			</tr>
-		<!-- /TMPL_LOOP -->
-	</table>
-</div>
-<!-- TMPL_INCLUDE NAME="acquisitions-bottom.inc" -->
\ No newline at end of file

Index: acqui/supplier.tmpl
===================================================================
RCS file: acqui/supplier.tmpl
diff -N acqui/supplier.tmpl
--- acqui/supplier.tmpl	1 Mar 2005 13:40:51 -0000	1.13
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,128 +0,0 @@
-<!-- TMPL_INCLUDE name="acquisitions-top.inc" -->
-
-<div id="mainbloc">
-	<form action=updatesupplier.pl method="post">
-	
-	<input type="hidden" name="id" value=<!-- TMPL_VAR NAME="id" -->>
-	
-	<!-- TMPL_IF name="id" -->
-		<h1 class="acquisition">Update: <!-- TMPL_VAR NAME="name" --></h1>
-	<!-- TMPL_ELSE -->
-		<h1 class="acquisition">Add supplier</h1>
-	<!-- /TMPL_IF -->
-	<div id="bloc25">
-		<h2 class="acquisition">COMPANY DETAILS</h2>
-		<p>
-			<label>Company Name</label>
-			<input type="text" size="40" name="company" value="<!-- TMPL_VAR NAME="name" -->">
-		</p>
-		<p>
-			<label>Postal Address</label>
-				<textarea name="company_postal" cols="40" rows="3"><!-- TMPL_VAR NAME="postal" --></textarea>
-		</p>
-		<p>
-			<label>Physical Address</label>
-			<textarea name="physical" cols="40" rows="4"><!-- TMPL_VAR NAME="address1" --><!-- TMPL_VAR NAME="address2" --><!-- TMPL_VAR NAME="address3" --><!-- TMPL_VAR NAME="address4" --></textarea>
-		</p>
-		<p>
-			<label>Phone</label>
-			<input type="text" size="20" name="company_phone" value="<!-- TMPL_VAR NAME="phone" -->">
-		</p>
-		<p>
-			<label>Fax</label>
-			<input type="text" size="20" name="company_fax" value="<!-- TMPL_VAR NAME="fax" -->">
-		</p>
-		<p>
-			<label>Website</label>
-			<input type="text" size="40" name="website" value="<!-- TMPL_VAR NAME="url" -->">
-		</p>
-		<h2 class="acquisition">CONTACT DETAILS</h2>
-		<p>
-			<label>Contact Name</label>
-			<input type="text" size="40" name="company_contact_name" value="<!-- TMPL_VAR NAME="contact" -->">
-		</p>
-		<p>
-			<label>Position</label>
-			<input type="text" size="40" name="company_contact_position" value="<!-- TMPL_VAR NAME="contpos" -->">
-		</p>
-		<p>
-			<label>Phone</label>
-			<input type="text" size="20" name="contact_phone" value="<!-- TMPL_VAR NAME="contphone" -->">
-		</p>
-		<p>
-			<label>Alternative phone</label>
-			<input type="text" size="20" name="contact_phone_2" value="<!-- TMPL_VAR NAME="contaltphone" -->">
-		</p>
-		<p>
-			<label>Fax</label>
-			<input type="text" size="20" name="contact_fax" value="<!-- TMPL_VAR NAME="contfax" -->">
-		</p>
-		<p>
-			<label>E-mail</label>
-			<input type="text" size="40" name="company_email" value="<!-- TMPL_VAR NAME="contemail" -->">
-		</p>
-		<p>
-			<label>Notes</label>
-			<textarea name="notes" cols="40" rows="4"><!-- TMPL_VAR NAME="contnotes" --></textarea>
-		</p>
-	</div>
-	<div id="bloc25">
-		<h2 class="acquisition">CURRENT STATUS</h2>
-		<p>
-			<label>Supplier is</label>
-				<!-- 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 -->
-		</p>
-		<h2 class="acquisition">ORDERING INFORMATION</h2>
-		</p>
-		<p>
-			<label>Publishers and Imprints</label>
-			<textarea name="publishers_imprints" cols="20" rows="4"><!-- TMPL_VAR NAME="specialty" --></textarea>
-		</p>
-		<p>
-			<label class="label100">List Prices are</label>
-				<select name="list_currency" size="1">
-				<!-- TMPL_LOOP NAME="loop_pricescurrency" -->
-					<!-- TMPL_VAR NAME="currency" -->
-				<!-- /TMPL_LOOP -->
-				</select>
-		</p>
-		<p>
-			<label class="label100">Invoice Prices are</label>
-				<select name="invoice_currency" size="1">
-				<!-- TMPL_LOOP NAME="loop_invoicecurrency" -->
-					<!-- TMPL_VAR NAME="currency" -->
-				<!-- /TMPL_LOOP -->
-				</select>
-		</p>
-		<p>
-			<label class="label100">GST Registered</label>
-				<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
-		</p>
-		<p>
-			<label class="label100">List Item Price Includes GST</label>
-				<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
-		</p>
-		<p>
-			<label class="label100">Invoice Item Price Includes GST</label>
-				<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
-		</p>
-		<p>
-			<label class="label100">Discount</label>
-			<input type="text" size="3" name="discount" value="<!-- TMPL_VAR NAME="discount" -->"> %
-		</p>
-	<br/>
-	<br/><input type="image"  name="submit" src="/<!-- TMPL_VAR NAME="theme" -->/images/filesave.png" border="0" title="save" alt="save" class="button acquisition">
-	</form>
-	</div>
-</div>
-
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->





More information about the Koha-cvs mailing list