From d01129231de594cb24da740e4d7a0ed82052adfd Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Thu, 18 May 2006 20:23:36 +0000
Subject: [PATCH] Synching with default template

---
 .../npl/en/acqui/suggestion-select.tmpl         |  7 +++++++
 .../npl/en/bull/subscription-add.tmpl           | 16 +++++++++-------
 .../npl/en/bull/subscription-detail.tmpl        | 17 ++++++++++-------
 koha-tmpl/intranet-tmpl/npl/en/stats.tmpl       |  2 ++
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl b/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl
index 41c8d7e36e..39517a87f2 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl
@@ -19,6 +19,7 @@
 			<th>Suggestion</th>
 			<th>Suggested by</th>
 			<th>Accepted by</th>
+			<th>Duplicate</th>
 			<th>&nbsp;</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="suggestions_loop" -->
@@ -40,6 +41,12 @@
 				<td>
 					<!-- TMPL_VAR NAME="surnamemanagedby" --><!-- TMPL_IF name="firstnamemanagedby" -->,<!-- /TMPL_IF --> <!-- TMPL_VAR NAME="firstnamemanagedby" -->
 				</td>
+				<td>
+					<!-- TMPL_IF name="duplicateBiblionumber" -->
+						<a href="#" onclick="window.open('/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicateBiblionumber" -->')">Duplicate suspected</a>
+						<a href="/cgi-bin/koha/acqui/suggestion-select.pl?booksellerid=<!-- TMPL_VAR name="supplierid" -->&amp;basketno=<!-- TMPL_VAR name="basketno"-->&amp;op=connectDuplicate&amp;duplicateNumber=<!-- TMPL_VAR name="duplicateBiblionumber" -->&amp;suggestionid=<!-- TMPL_VAR name="suggestionid" -->">Connect</a>
+					<!-- /TMPL_IF -->
+				</td>
 				<td>
 					<!-- 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" -->&amp;biblio=<!-- TMPL_VAR name="biblionumber" -->">Order</a>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
index 556c1e2514..1a87b96005 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl
@@ -167,20 +167,22 @@
 				<td><input type="text" name="every2" value="<!-- TMPL_VAR name="every2" -->"></td>
 				<td><input type="text" name="every3" value="<!-- TMPL_VAR name="every3" -->"></td>
 			</tr>
-			<tr>
-				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
-				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
-				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
-				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
-			</tr>
 			<!-- TMPL_IF name="mod" -->
 			<tr>
 				<th scope="row"><label for="innerloop">The loop is for instance:</label></th>
+				<!-- TMPL_ELSE -->
+					<td>Starting period</td>
+				<!-- /TMPL_IF -->
 				<td><input type="text" id="innerloop" name="innerloop1" value="<!-- TMPL_VAR name="innerloop1" -->"></td>
 				<td><input type="text" name="innerloop2" value="<!-- TMPL_VAR name="innerloop2" -->"></td>
 				<td><input type="text" name="innerloop3" value="<!-- TMPL_VAR name="innerloop3" -->"></td>
 			</tr>
-			<!-- /TMPL_IF -->
+			<tr>
+				<th scope="row"><label for="whenmorethan1">When more than:</label></th>
+				<td><input type="text" id="whenmorethan1" name="whenmorethan1" value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
+				<td><input type="text" name="whenmorethan2" value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
+				<td><input type="text" name="whenmorethan3" value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
+			</tr>
 			<tr>
 				<th scope="row"><label for="setto1">...Set back to:</label></th>
 				<td><input type="text" id="setto1" name="setto1" value="<!-- TMPL_VAR name="setto1" -->"></td>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
index d0242e85ce..e1e8afae2b 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-detail.tmpl
@@ -135,13 +135,16 @@
 				<td><!-- TMPL_VAR name="every3" --></td>
 			</tr>
 			<tr>
-				<th scope="row">When more than:</th>
-				<td><!-- TMPL_VAR name="whenmorethan1" --> <!-- TMPL_IF name="innerloop1" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop1" -->)</i><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_VAR name="whenmorethan2" --> <!-- TMPL_IF name="innerloop2" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop2" -->)</i><!-- /TMPL_IF --></td>
-				<td><!-- TMPL_VAR name="whenmorethan3" --> <!-- TMPL_IF name="innerloop3" --><br/>
-					<i>(is <!-- TMPL_VAR name="innerloop3" -->)</i><!-- /TMPL_IF --></td>
+				<th scope="row">Starting period</th>
+				<td><!-- TMPL_IF name="innerloop1" --><!-- TMPL_VAR name="innerloop1" --><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_IF name="innerloop2" --><!-- TMPL_VAR name="innerloop2" --><!-- /TMPL_IF --></td>
+				<td><!-- TMPL_IF name="innerloop3" --><!-- TMPL_VAR name="innerloop3" --><!-- /TMPL_IF --></td>
+			</tr>
+			<tr>
+				<th scope="row">When more than</th>
+				<td><!-- TMPL_VAR name="whenmorethan1" --></td>
+				<td><!-- TMPL_VAR name="whenmorethan2" --></td>
+				<td><!-- TMPL_VAR name="whenmorethan3" --></td>
 			</tr>
 			<tr>
 				<th scope="row">Set back to:</th>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl b/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl
index eb59360235..8d03f55183 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/stats.tmpl
@@ -8,6 +8,7 @@
 	<caption>Statistics</caption>
 		<tr>
 			<th>Name</th>
+			<th>Description</th>
 			<th>Type</th>
 			<th>Date/time</th>
 			<th>Amount</th>
@@ -16,6 +17,7 @@
 		<!-- TMPL_LOOP name="loop1" -->
 		<tr>
 			<td><!-- TMPL_VAR NAME="name" --></td>
+			<td><!-- TMPL_VAR NAME="description" --></td>
 			<td><!-- TMPL_VAR NAME="type" --></td>
 			<td><!-- TMPL_VAR NAME="time" --></td>
 			<td><!-- TMPL_VAR NAME="amount" --></td>
-- 
2.39.5