From 1b6672bc505347cf1ecdb8df09ddc965577a3b8d Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Wed, 4 Jan 2006 18:12:21 +0000
Subject: [PATCH] Synching with default template

---
 .../npl/en/acqui/histsearch.tmpl              |   5 +
 .../npl/en/acqui/lateorders.tmpl              | 107 ++++++++++++++++++
 .../intranet-tmpl/npl/en/acqui/newbiblio.tmpl |  32 ++++--
 3 files changed, 136 insertions(+), 8 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl

diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl
index fa875c33d1..883fd0bd86 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/histsearch.tmpl
@@ -14,6 +14,7 @@
 			<th>Placed on</th>
 			<th>Recieved on</th>
 			<th>Quantity ordered</th>
+			<th>Quantity received</th>
 			<th>Unit cost</th>
 			<th>&nbsp;</th>
 		</tr>
@@ -82,6 +83,7 @@
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
 				<th>&nbsp;</th>
+				<th>&nbsp;</th>
 				<th><input type="submit" class="submit" value="Set Filter" /></th>
 		</tr></thead>
 		<tfoot><tr>
@@ -90,7 +92,9 @@
 			<td>&nbsp;</td>
 			<td>&nbsp;</td>
 			<td>&nbsp;</td>
+			<td>&nbsp;</td>
 			<td class="total"><!-- TMPL_VAR name="total_qty" --></td>
+			<td class="total"><!-- TMPL_VAR name="total_qtyreceived" --></td>
 			<td class="total"><!-- TMPL_VAR name="total_price" --></td>
 			<td>&nbsp;</td>
 		</tr></tfoot>
@@ -108,6 +112,7 @@
 				<td><!-- TMPL_VAR name="creationdate" --></td>
 				<td><!-- TMPL_VAR name="datereceived" --></td>
 				<td><!-- TMPL_VAR name="quantity" --></td>
+				<td><!-- TMPL_VAR NAME="quantityreceived" --></td>
 				<td class="credit"><!-- TMPL_VAR name="ecost" --></td>
 				<td>&nbsp;</td>
 			</tr>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl
new file mode 100644
index 0000000000..b55ee4dc35
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/lateorders.tmpl
@@ -0,0 +1,107 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Acquisitions: Late Orders<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
+
+<div id="main">
+	<h1><!-- TMPL_IF name="Supplier" --><!-- TMPL_VAR name="Supplier" --> : <!--/TMPL_IF -->Late issues</h1>
+	<table>
+		<tr>
+			<th>Supplier</th>
+			<th>Order Date</th>
+			<th>Ordered for</th>
+			<th>Including Basket</th>
+			<th>Book information</th>
+			<th>Branch</th>
+			<th>Estimated Unit Price</th>
+			<th>Retailer Catalogue Unit Price</th>
+			<th>Quantity</th>
+			<th>Total cost</th>
+			<th>Budget</th>
+			<th>&nbsp;</th>
+		</tr>
+		<tr>
+			<form action="lateorders.pl" method="post">
+				<td>
+					<!-- TMPL_VAR name="CGIsupplier" -->
+				</td>
+				<td> &nbsp;</td>
+				<td>
+					<input size="4" maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->" > days
+				</td>
+				<td colspan="2">
+					&nbsp;
+				</td>
+				<td>
+					<!-- TMPL_VAR name="CGIbranch" -->
+				</td>
+				<td colspan="5">
+					&nbsp;
+				</td>
+				
+				<td>
+					<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>
+					<!-- TMPL_VAR name="supplier" -->
+				</td>
+				<td>
+					<!-- TMPL_VAR name="orderdate" -->
+				</td>
+				<td class="number">
+					<!-- TMPL_VAR name="latesince" -->
+				</td>
+				<td>
+					<!-- 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>
+					<!-- TMPL_VAR name="branch" -->
+				</td>
+				<td>
+					<!-- TMPL_VAR name="unitpricelib" -->
+				</td>
+				<td>
+					<!-- TMPL_VAR name="unitpricesupplier" -->
+				</td>
+				<td>
+					<!-- TMPL_VAR name="quantity" -->
+				</td>
+				<td>
+					<!-- TMPL_VAR name="subtotal" -->
+				</td>
+				<td>
+					<!-- TMPL_VAR name="budget" -->
+				</td>
+				<td>
+					&nbsp;
+				</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		<tr> 
+				<th>
+					Total
+				</th>
+				<th colspan="2">
+					&nbsp;
+				</th>
+				<th> &nbsp;</th>
+				<th colspan="5">
+					&nbsp;
+				</th>
+				
+				<th>
+					<!-- TMPL_VAR name="total" -->
+				</th>
+		</tr>
+	</table>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
index 867f0f90a3..f8b765ca8f 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/newbiblio.tmpl
@@ -133,14 +133,30 @@ function check(f) {
 	<div class="data">
 		<table>
 		<caption>Accounting details</caption>
-		<tr><th><label for="quantity">Quantity</label></th><td><input type="text" size="20" id="quantity" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" /></td></tr>
-		<tr><th><label for="bookfund">Bookfund</label></th><td><!-- TMPL_VAR NAME="CGIbookfund" --></td></tr>
-		<tr><th><label for="list_price">Suppliers List Price</label></th><td><input type="text" size="20" id="list_price" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" /></td></tr>
-		<tr><th><label for="rrp">Replacement Cost </label></th><td><input type="text" size="20" id="rrp" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /></td></tr>
-		<tr><th><label for="ecost">Budgeted Cost</label></th><td><input type="text" size="20" id="ecost" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"  /></td></tr>
-		<tr><th><label for="GST">Budgeted GST</label></th><td><input type="text" size="20" id="GST" name="GST" value=""  /></td></tr>
-		<tr><th><label for="total"><strong>BUDGETED TOTAL</strong></label></th><td><input type="text" size="20" id="total" name="total" value=""  /></td></tr>
-		<tr><th><label for="cost">Actual Cost</label></th><td><input type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR name="ecost"-->" /></td></tr>
+		<tr><th><label for="quantity">Quantity</label></th><td><!-- TMPL_IF name="close" -->
+				<input type="hidden" name="quantity" id="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" id="quantity" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
+		  	<!--/TMPL_IF--></td></tr>
+		<tr><th><label for="bookfund">Bookfund</label></th><td><!-- TMPL_IF name="close" -->
+				<input type="hidden" name="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
+			<!-- TMPL_ELSE -->
+				<!-- TMPL_VAR NAME="CGIbookfund" -->
+		  	<!--/TMPL_IF--></td></tr>
+		<tr><th><label for="list_price">Suppliers List Price</label></th><td><!-- TMPL_IF name="close" -->
+				<input type="hidden"  name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" id="list_price" name="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
+		  	<!--/TMPL_IF--></td></tr>
+		<tr><th><label for="rrp">Replacement Cost </label></th><td><!-- TMPL_IF name="close" -->
+				<input type="hidden" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" size="20" id="rrp" name="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
+		  	<!--/TMPL_IF--></td></tr>
+		<tr><th><label for="ecost">Budgeted Cost</label></th><td><input type="text" size="20" id="ecost" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->"<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF--> /></td></tr>
+		<tr><th><label for="GST">Budgeted GST</label></th><td><input type="text" size="20" id="GST" name="GST" value=""<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF-->  /></td></tr>
+		<tr><th><label for="total"><strong>BUDGETED TOTAL</strong></label></th><td><input type="text" size="20" id="total" name="total" value=""<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF--> /></td></tr>
+		<tr><th><label for="cost">Actual Cost</label></th><td><input type="text" size="20" id="cost" name="cost" value="<!-- TMPL_VAR name="ecost"-->"<!-- TMPL_IF name="close" --> readonly="readonly"<!--/TMPL_IF--> /></td></tr>
 		<tr><th><label for="invoice">Invoice Number *</label></th><td><input type="text" size="20" id="invoice" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /></td></tr>
 		<tr><th><label for="notes-details">Notes</label></th><td><input type="text" size="20" id="notes-details" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" /></td></tr>
 		<tr><th><label for="sort1">Sort field 1</label></th><td>