From e70cf8abf6f023bd8c0fed5e4984a59fbf680909 Mon Sep 17 00:00:00 2001
From: oleonard <oleonard>
Date: Mon, 2 May 2005 20:07:48 +0000
Subject: [PATCH] Synching with rel_2_2.

---
 .../npl/en/reports/acquisitions_stats.tmpl    | 269 +++++++++++++++++
 .../npl/en/reports/bor_issues_top.tmpl        | 244 +++++++++++++++
 .../npl/en/reports/borrowers_out.tmpl         |  99 +++++++
 .../npl/en/reports/borrowers_stats.tmpl       | 145 ++++-----
 .../npl/en/reports/cat_issues_top.tmpl        | 245 +++++++++++++++
 .../npl/en/reports/catalogue_out.tmpl         | 105 +++++++
 .../npl/en/reports/catalogue_stats.tmpl       | 180 +++++------
 .../npl/en/reports/inventory.tmpl             | 156 +++++-----
 .../npl/en/reports/issues_avg_stats.tmpl      | 280 ++++++++++++++++++
 .../reports/issues_by_borrower_category.tmpl  |  24 +-
 .../npl/en/reports/issues_stats.tmpl          | 255 ++++++++++++++++
 .../npl/en/reports/itemtypes.tmpl             |  19 +-
 .../npl/en/reports/reports-home.tmpl          |  46 ++-
 .../npl/en/search.marc/search.tmpl            |  21 +-
 .../npl/en/z3950/searchresult.tmpl            |  38 +--
 15 files changed, 1795 insertions(+), 331 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/reports/acquisitions_stats.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/reports/bor_issues_top.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/reports/cat_issues_top.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/reports/catalogue_out.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/reports/issues_avg_stats.tmpl
 create mode 100644 koha-tmpl/intranet-tmpl/npl/en/reports/issues_stats.tmpl

diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/acquisitions_stats.tmpl
new file mode 100644
index 0000000000..b78b9b08a3
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/acquisitions_stats.tmpl
@@ -0,0 +1,269 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<div id="main" >
+
+<!-- TMPL_IF NAME="do_it" -->
+	<!-- TMPL_LOOP NAME="mainloop" -->
+		<h1>Koha : Acquisitions statistics </h1>
+		<!-- TMPL_IF NAME="loopfilter"-->
+			<p>Filtered on</p>
+			<!-- TMPL_LOOP NAME="loopfilter" -->
+					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><!-- TMPL_VAR NAME="crit"--> =<!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_IF NAME="loopfilter"-->
+		<br />
+		<table>
+			<tr >
+				<th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
+				<!-- TMPL_LOOP NAME="loopcol" -->
+					<th><!-- TMPL_VAR NAME="coltitle" --></th>
+				<!-- /TMPL_LOOP -->
+				<th>TOTAL</th>
+			</tr>
+				<!-- TMPL_LOOP NAME="looprow" -->
+					<tr>
+						<!-- TMPL_IF NAME="highlight" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+						<!-- TMPL_VAR NAME="rowtitle" --></td>
+						<!-- TMPL_LOOP NAME="loopcell" -->
+							<!-- TMPL_IF NAME="highlight" --><td class="numberhighlight"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+								<!-- TMPL_IF Name="value" --><!-- TMPL_VAR NAME="value" -->
+								<!-- TMPL_ELSE--> &nbsp;
+								<!-- /TMPL_IF -->
+							</td>
+						<!-- /TMPL_LOOP -->
+						<!-- TMPL_IF NAME="highlight" --><td class="numberhighlight"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+							<!-- TMPL_VAR NAME="totalrow" -->
+						</td>
+					</tr>
+				<!-- /TMPL_LOOP NAME="looprow" -->
+				<tr >
+					<th>TOTAL</th>
+					<!-- TMPL_LOOP NAME="loopfooter" -->
+						<th>
+							<!-- TMPL_VAR NAME="totalcol" -->
+						</th>
+					<!-- /TMPL_LOOP -->
+					<th><!-- TMPL_VAR NAME="total" --></th>
+				</tr>
+		</table>
+	<!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+	<h1>Acquisitions Statistics</h1>
+	<form method="post">
+	<div class="data"><table>
+		<tbody>
+			<tr>
+				<th>Display Order Date As:</th>
+				<td><label for="Line">Row:</label> <input type="radio" name="Line" id="Line" value="aqbasket.closedate" /> <label for="Column">Column:</label> <input type="radio" name="Column" value="aqbasket.closedate" /></td>
+			</tr>
+			<tr>
+			<th>Limit by Date: </th>
+			<td><label for="from1">From: </label><input type="text"  size="10" id="from1" name="Filter" />
+							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+								<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>
+					<label for="to1">To:</label> <input  size="10" id="to1" name="Filter" value="" type="text" />
+						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" >
+							<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>
+				</td>
+			</tr>
+			<tr> 
+				<th>Group by: </th>
+				<td><select name="PlacedOnDisplay">
+					<option value="">None</option>
+					<option value ="1">Day of week</option>
+					<option value ="2">Month</option>
+					<option value ="3">Year</option>
+					</select>
+				</td>
+			</tr></table></div>
+			
+			<div class="data">
+			<table>
+			<tr>
+				<th>Display Received Date As:</th>
+				<td><label for="Line2">Row: </label><input type="radio" name="Line" id="Line2" value="aqorderdelivery.deliverydate" /> <label for="Column2">Column: </label><input type="radio" name="Column" id="Column2" value="aqorderdelivery.deliverydate" /></td>
+			</tr>
+			<tr>
+			<th>Limit by Date: </th>
+				<td><label for="fromRO">From:</label> <input type="text"  size="10" id="fromRO" name="Filter" />
+							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarFromRO" style="cursor: pointer;" />
+								<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('toRO').value.split("-");
+										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+										if (date > limitDate) {
+											return true;
+										} else {
+											return false;
+										}
+									}
+					
+									Calendar.setup(
+										{
+											inputField : "fromRO",
+											ifFormat : "%Y-%m-%d",
+											button : "openCalendarFromRO",
+											disableFunc : validate1,
+											dateStatusFunc : validate1
+										}
+									);
+								</script>
+					<label for="toRO">To: </label><input type="text"  size="10" id="toRO" name="Filter" value="" />
+						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" border="0" />
+							<script language="JavaScript" 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('fromRO').value.split("-");
+									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+									if (limitDate > date) {
+										return true;
+									} else {
+										return false;
+									}
+								}
+		
+								Calendar.setup(
+									{
+										inputField : "toRO",
+										ifFormat : "%Y-%m-%d",
+										button : "openCalendarToRO",
+										disableFunc : validate2,
+										dateStatusFunc : validate2
+									}
+								);
+							</script>
+				</td>
+			</tr>
+			<tr> 
+				<th>Group by: </th>
+				<td><select name="ReceivedOnDisplay">
+					<option value="">None</option>
+					<option value ="1">Day of week</option>
+					<option value ="2">Month</option>
+					<option value ="3">Year</option>
+					</select>
+				</td>
+			</tr></table>
+			
+			<table>
+			<tr>
+				<th>Display Book Seller As:</th>
+				<td><label for="Line3">Row</label><input type="radio" name="Line" id="Line3" value="aqbooksellers.name" /> <label for="Column3">Column</label><input type="radio" name="Column" id="Column3" value="aqbooksellers.name" /></td>
+			</tr>
+			<tr><th><label for="Filter">Limit by Book Seller:</label></th>
+				<td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
+			</tr>
+			<tr>
+				<th>Display Budget As:</th>
+				<td><label for="Line4">Row</label><input type="radio" name="Line" id="Line4" value="aqorderbreakdown.bookfundid" /> <label for="Column4">Column</label><input type="radio" name="Column" id="Column4" value="aqorderbreakdown.bookfundid" /></td></tr>
+			<tr>
+				<th><label for="Filter">Limit by Budget:</label> </th>
+				<td><!-- TMPL_VAR NAME="CGIBudget" --></td>
+			</tr>
+			<!-- TMPL_IF Name="hassort1" -->
+				<tr> 
+					<th>Sort 1:</th>
+					<td><input type="radio" name="Line" value="aqorders.sort1" /></td>
+					<td><input type="radio" name="Column" value="aqorders.sort1" /></td>
+					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
+				</tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF Name="hassort2" -->
+				<!-- TMPL_IF Name="HglghtSort2"--><tr> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> 
+					<th>Sort 2:</th>
+					<td><input type="radio" name="Line" value="aqorders.sort2" /></td>
+					<td><input type="radio" name="Column" value="aqorders.sort2" /></td>
+					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
+				</tr>
+			<!-- /TMPL_IF -->
+		</tbody>
+	</table>
+	<table>
+		<tr>
+			<th>Cell Value: </th><td><label for="Cellvalue1">Count items</label><input type="radio" name="Cellvalue" id="Cellvalue1" value="1" checked="checked" /> 
+			<label for="Cellvalue2"> Amount</label><input type="radio" name="Cellvalue" id="Cellvalue2" value="2" /></td></tr>
+	</table>
+	<table>
+	<caption>Output Options</caption>
+	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
+	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file"></td></tr>
+<tr><td>&nbsp;</td><td>...named:   <input type="text" name="basename" value="Export"></td></td></tr>
+<tr><td>&nbsp;</td><td>File Format: <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
+<tr><td>&nbsp;</td><td>Delimiter: <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
+</table>
+		</div>
+	<p>
+	<input TYPE="submit" value="Generate Report" class="submit" />
+	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+	<input type="hidden" name="do_it" value="1" />
+	</form>
+
+<!-- /TMPL_IF -->
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/bor_issues_top.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/bor_issues_top.tmpl
new file mode 100644
index 0000000000..e7bc213382
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/bor_issues_top.tmpl
@@ -0,0 +1,244 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+<div id="main" >
+
+<!-- TMPL_IF NAME="do_it" -->
+<script language="JavaScript" type="text/javascript">
+function Dopop(link) {
+	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
+}
+</script>
+	<!-- TMPL_LOOP NAME="mainloop" -->
+		<h1>Koha : Top <!-- TMPL_VAR NAME="limit"--> List borrowers for Issues </h1>
+		<!-- TMPL_IF NAME="loopfilter"-->
+			<p>Filtered on</p>
+			<!-- TMPL_LOOP NAME="loopfilter" -->
+					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_IF NAME="loopfilter"-->
+		<br>
+		<table>
+			<tr>
+				<th>Rank/Borrowers</th>
+				<!-- TMPL_LOOP NAME="loopcol" -->
+					<th colspan="2"><!-- TMPL_VAR NAME="coltitle" --></th>
+				<!-- /TMPL_LOOP -->
+			</tr>
+			<tr >
+				<th>&nbsp;</th>
+				<!-- TMPL_LOOP NAME="loopcol" -->
+					<th>Borrower</th>
+					<th>Issues count</th>
+				<!-- /TMPL_LOOP -->
+			</tr>
+				<!-- TMPL_LOOP NAME="looprow" -->
+					<!-- TMPL_IF NAME="hilighted" --><tr class="highlight"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+						<td>
+						<!-- TMPL_VAR NAME="rowtitle" --></td>
+						<!-- TMPL_LOOP NAME="loopcell" -->
+						<td>
+								<!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../members/moremember.pl?bornum=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
+							</td>
+							<td>
+								<!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
+							</td>
+						<!-- /TMPL_LOOP -->
+					</tr>
+				<!-- /TMPL_LOOP NAME="looprow" -->
+		</table>
+	<!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+	<h1>Koha : Top List borrowers for Issues  </h1>
+	<form method="post">
+	
+	<div class="data"><table>
+		<thead>
+			<tr>
+			<th><label for="">Limit Number of Results:</label> </th><td><select name="Limit">
+						<option value ="5" checked="checked"> 5</option>
+						<option value ="10">10</option>
+						<option value ="15">15</option>
+						<option value ="20">20</option>
+	<!--					<option value ="25">25</option>
+						<option value ="40">40</option>
+						<option value ="50">50</option>
+						<option value ="100">100</option>-->
+					</select></td></tr>
+		<tr><th><label for="">Limit By:</label> </th><td>
+					<select name="Criteria">
+						<option value ="" checked="checked">None</option>
+						<option value ="issuingbranch">Branch</option>
+						<option value ="categorycode">Categorycode</option>
+						<option value ="itemtype">Itemtype</option>
+						<option value ="Day">Day</option>
+						<option value ="Week">Week</option>
+						<option value ="Month">Month</option>
+						<option value ="Year">Year</option>
+					</select>
+				</td>
+			</tr>
+			
+			<tr><th><label for="">Limit by Issue Date:</label> </th>
+				<td>From: <input type="text" readonly="readonly" size="10" id="from" name="Filter" >
+							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+								<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: <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text">
+						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+							<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>
+				</td>
+			</tr>
+			<tr><th><label for="">Limit by Return Date: </label></th>
+				<td> From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" >
+							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
+								<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('toRO').value.split("-");
+										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+										if (date > limitDate) {
+											return true;
+										} else {
+											return false;
+										}
+									}
+					
+									Calendar.setup(
+										{
+											inputField : "fromRO",
+											ifFormat : "%Y-%m-%d",
+											button : "openCalendarFromRO",
+											disableFunc : validate1,
+											dateStatusFunc : validate1
+										}
+									);
+								</script>
+					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" >
+						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+							<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('fromRO').value.split("-");
+									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+									if (limitDate > date) {
+										return true;
+									} else {
+										return false;
+									}
+								}
+		
+								Calendar.setup(
+									{
+										inputField : "toRO",
+										ifFormat : "%Y-%m-%d",
+										button : "openCalendarToRO",
+										disableFunc : validate2,
+										dateStatusFunc : validate2
+									}
+								);
+							</script>
+				</td>
+			</tr>
+			<tr><th><label for="">Limit by Branch:</label> </th>
+				<td><input type="text" name="Filter" value="" /></td>
+			</tr>
+			<tr><th><label for="">Limit by Document Type:</label> </th>
+				<td><input type="text" name="Filter" value="" /></td>
+			</tr>
+			<tr><th><label for="">Limit by Borrower Category:</label> </th>
+				<td><input type="text" name="Filter" value="" /></td>
+			</tr>
+			<tr><th><label for="">Limit by Day:</label> </th>
+				<td><input type="text" name="Filter" value="" /></td>
+			</tr>
+			<tr><th><label for="">Limit by Month:</label> </th>
+				<td><input type="text" name="Filter" value="" /></td>
+			</tr>
+			<tr><th><label for=""><label for="">Limit by Year:</label></label> </th>
+				<td><input type="text" name="Filter" value="" /></td>
+			</tr>
+		</tbody>
+	</table>
+	
+<table>
+	<caption>Output Options</caption>
+	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
+	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
+<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
+<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
+<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
+</table>
+		
+	<p>
+	<input type="submit" value="Generate Report" class="submit" />
+	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+	<input type="hidden" name="do_it" value="1" />
+	</form></p>
+	</div>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl
new file mode 100644
index 0000000000..3d94f407ba
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl
@@ -0,0 +1,99 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<div id="main">
+
+<!-- TMPL_IF NAME="do_it" -->
+	<!-- TMPL_LOOP NAME="mainloop" -->
+		<h1>Patrons with No Issues </h1>
+		<!-- TMPL_IF NAME="loopfilter"-->
+			<p>Filtered on</p>
+			<!-- TMPL_LOOP NAME="loopfilter" -->
+					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF --></p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_IF NAME="loopfilter"-->
+		
+		<table>
+			<tr>
+				<th>Num/Borrowers</th>
+				<!-- TMPL_LOOP NAME="loopcol" -->
+					<th><!-- TMPL_VAR NAME="coltitle" --></th>
+				<!-- /TMPL_LOOP -->
+			</tr>
+				<!-- TMPL_LOOP NAME="looprow" -->
+					<tr>
+						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+						<!-- TMPL_VAR NAME="rowtitle" --></td>
+						<!-- TMPL_LOOP NAME="loopcell" -->
+							<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+							</td>
+						<!-- /TMPL_LOOP -->
+					</tr>
+				<!-- /TMPL_LOOP NAME="looprow" -->
+		</table>
+	<!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+	<h1>Koha : Borrowers with no Issues  </h1>
+	<form method="post">
+	
+	<table>
+		<thead>
+			<tr>
+			<th>Limit to </th>
+			<th>By </th>
+			<th colspan="2">Filters</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>
+					<select name="Limit">
+						<option value ="" checked>None</option>
+						<option value ="5"> 5</option>
+						<option value ="10">10</option>
+						<option value ="15">15</option>
+						<option value ="20">20</option>
+						<option value ="25">25</option>
+						<option value ="40">40</option>
+						<option value ="50">50</option>
+						<option value ="100">100</option>
+					</select>
+				</td>
+				<td>
+					<select name="Criteria">
+						<option value ="" checked>None</option>
+						<option value ="categorycode">Categorycode</option>
+						<option value ="itemtype">Itemtype</option>
+					</select>
+				</td>
+				<td colspan="2">&nbsp;</td>
+			</tr>
+			<tr>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td><label for="borrowercategory">Borrower Category</label></td>
+				<td><input type="text" name="Filter" id="borrowercategory" value="" /></td>
+			</tr>
+		</tbody>
+	</table>
+	
+<table>
+	<caption>Output Options</caption>
+	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
+	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
+<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
+<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
+<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
+</table>
+		
+	<p>
+	<input type="submit" value="Generate Report" class="submit" />
+	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+	<input type="hidden" name="do_it" value="1" />
+	</form></p>
+	</div>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_stats.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_stats.tmpl
index 05f46cf892..58e6c0abd4 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_stats.tmpl
@@ -1,87 +1,71 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports: Patron Statistics<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-<div id="main">
+<div id="main" >
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Borrowers statistics </h1>
+		<h1>Patron Statistics Report</h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
-			<p>Filtered on</p>
+			<p>Showing patron counts by category where 
 			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><label> <!-- TMPL_VAR NAME="crit"--> = </label><!-- TMPL_VAR NAME="filter"--></p>
-			<!-- /TMPL_LOOP -->
+					<strong><!-- TMPL_VAR NAME="crit"--></strong> is <span class="ex"><!-- TMPL_VAR NAME="filter"--></span>,
+			<!-- /TMPL_LOOP --></p>
 		<!-- /TMPL_IF NAME="loopfilter"-->
-		<table>
-			<tr>
-				<th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
+		<div class="table"><table>
+			<tr >
+				<th scope="col"><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
 				<!-- TMPL_LOOP NAME="loopcol" -->
-					<th><!-- TMPL_VAR NAME="coltitle" --></th>
+					<th scope="col"><!-- TMPL_VAR NAME="coltitle" --></th>
 				<!-- /TMPL_LOOP -->
-				<th>TOTAL</th>
+				<th scope="col">Total</th>
 			</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
-					<tr>
-						<!-- TMPL_IF NAME="highlighted" --><td class="highlighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+					<!-- TMPL_IF NAME="hilighted" --><tr class="highlight"><!-- TMPL_ELSE --><!-- /TMPL_IF -->
+						<td>
 						<!-- TMPL_VAR NAME="rowtitle" --></td>
 						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="highlighted" --><td class="numberhighlighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-								<!-- TMPL_VAR NAME="value" -->
-							</td>
+							<td class="sum">
+								<!--TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" -->
+								<!--TMPL_ELSE-->
+									&nbsp;
+								<!--/TMPL_IF-->
+								</td>
 						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="highlighted" --><td class="numberhighlighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+						<td class="sum">
 							<!-- TMPL_VAR NAME="totalrow" -->
 						</td>
 					</tr>
 				<!-- /TMPL_LOOP NAME="looprow" -->
-				<tr>
-					<th>TOTAL</th>
+				<tfoot>
+				<tr >
+					<td>TOTAL</td>
 					<!-- TMPL_LOOP NAME="loopfooter" -->
-						<th>
+						<td class="sum">
 							<!-- TMPL_VAR NAME="totalcol" -->
-						</th>
+						</td>
 					<!-- /TMPL_LOOP -->
-					<th><!-- TMPL_VAR NAME="total" --></th>
+					<td class="sum"><!-- TMPL_VAR NAME="total" --></td>
 				</tr>
-		</table>
+				</tfoot>
+		</table></div>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Borrowers statistics</h1>
-	<form method="post" action="borrowers_stats.pl">
+<h1>Build Patron Statistics Report</h1>
+<div class="help">Choose at least one piece of information to display as a row in the report, and one to display as a column.</div>
+	<form method="post">
+<div class="data">
 	<table>
-		<thead>
-			<tr>
-			<th>Title</th>
-			<th>Row</th>
-			<th>Column</th>
-			<th>Filter</th>
-			</tr>
-		</thead>
+	<caption>Patron Category</caption>
+	<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Category</th><th scope="col">Limit by Status</th></tr></thead>
 		<tbody>
-			<tr class="highlighted">
-			<td>Borrower category</td>
-			<td><input type="radio" name="Line" value="categorycode" /></td>
-			<td><input type="radio" name="Column" value="categorycode" /></td>
-			<td ><!-- TMPL_VAR NAME="CGICatCode" --></td>
-			</tr>
-			<tr>
-			<td>Borrower status</td>
-			<td></td>
-			<td></td>
-			<td ><select name="status"><option value=""> </option><option value="debarred">debarred</option><option value="gonenoadress">gone no adress</option><option value="lost">lost</option></td>
-			</tr>
-			<tr class="highlighted">
-			<td>
-			Zip Code
-			</td>
-			<td><input type="radio" name="Line" value="zipcode" /></td>
-			<td><input type="radio" name="Column" value="zipcode" /></td>
-			<td><input type="text"  name="Filter" /></td>
-			</tr>
-			<tr class="highlighted">
-			<td>&nbsp;</td>
-			<td colspan="2"><select name="digits">
+			<tr><td><input type="radio" name="Line" value="categorycode" /></td><td><input type="radio" name="Column" value="categorycode" /></td><td><!-- TMPL_VAR NAME="CGICatCode" --></td><td><select name="status"><option value=""> </option><option value="debarred">debarred</option><option value="gonenoadress">gone no adress</option><option value="lost">lost</option></td></tr>
+</table>
+<table>
+	<caption>Patron Zip Code</caption>
+		<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Zip Code</th><th scope="col">Limit Filter</th></tr></thead>
+			<tr><td><input type="radio" name="Line" value="zipcode" /></td><td><input type="radio" name="Column" value="zipcode" /></td><td><input type="text" size="10" id="zipcode" name="Filter" /></td><td><select name="digits">
 			<option value=""> </option>
 			<option value ="1">1</option>
 			<option value ="2">2</option>
@@ -93,44 +77,33 @@
 			<option value ="8">8</option>
 			<option value ="9">9</option>
 			<option value ="10">10</option>
-			</select>
-			digits 
-			</td>
-			<td>&nbsp;</td>
-			</tr>
+			</select> digits</td></tr>
+	</table>
 			<!-- TMPL_IF name="hassort1" -->
-			<tr>
-			<td>Sort1</td>
-			<td><input type="radio" name="Line" value="sort1" /></td>
-			<td><input type="radio" name="Column" value="sort1" /></td>
-			<td ><!-- TMPL_VAR NAME="CGISort1" --></td>
-			</tr>
+				<table><caption>Sorting Field 1</caption>
+						<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col" colspan="2">Limit by Sorting Field 1</th></tr></thead>
+				<tr><td><input type="radio" name="Line" value="sort1" /></td><td><input type="radio" name="Column" value="sort1" /></td><td colspan="2"><!-- TMPL_VAR NAME="CGISort1" --></td></tr></table>
 			<!-- /TMPL_IF -->
-			<!-- TMPL_IF name="hassort2" -->			
-			<tr class="highlighted" >
-			<td>Sort2</td>
-			<td><input type="radio" name="Line" value="sort2" /></td>
-			<td><input type="radio" name="Column" value="sort2" /></td>
-			<td><!-- TMPL_VAR NAME="CGISort2" --></td>
-			</tr>
+			<!-- TMPL_IF name="hassort2" -->
+							<table><caption>Sorting Field 2</caption>
+						<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col" colspan="2">Limit by Sorting Field 2</th></tr></thead>
+				<tr><td><input type="radio" name="Line" value="sort2" /></td><td><input type="radio" name="Column" value="sort2" /></td><td colspan="2"><!-- TMPL_VAR NAME="CGISort1" --></td></tr></table>
 			<!-- /TMPL_IF -->
-		</tbody>
-	</table>
-	
-	<div class="details">
-		<h3> Output </h3>
-		<input type="radio" checked="checked" name="output" value="screen" /> To screen into the browser
-		<br />
-		<input type="radio" name="output" value="file" /> To file <input type="text" name="basename" value="Export"   /> into an application  
-		<!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" -->
-	</p>
+<table>
+	<caption>Output Options</caption>
+	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
+	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file"></td></tr>
+<tr><td>&nbsp;</td><td>...named:   <input type="text" name="basename" value="Export"></td></td></tr>
+<tr><td>&nbsp;</td><td>File Format: <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
+<tr><td>&nbsp;</td><td>Delimiter: <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
+</table>
 	</div>
 	<p>
-	<input type="submit" value="OK" class="submit" />
+	<input TYPE="submit" value="Generate Report" class="submit" />
 	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
 	<input type="hidden" name="do_it" value="1" />
 	</form>
 <!-- /TMPL_IF -->
 </div>
+
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/cat_issues_top.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/cat_issues_top.tmpl
new file mode 100644
index 0000000000..fd6efa1292
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/cat_issues_top.tmpl
@@ -0,0 +1,245 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<div id="main">
+
+<!-- TMPL_IF NAME="do_it" -->
+<script language="JavaScript" type="text/javascript">
+function Dopop(link) {
+	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
+}
+</script>
+	<!-- TMPL_LOOP NAME="mainloop" -->
+		<h1>Koha : Top <!-- TMPL_VAR NAME="limit"--> List On Catalogue Issues </h1>
+		<!-- TMPL_IF NAME="loopfilter"-->
+			<p>Filtered on</p>
+			<!-- TMPL_LOOP NAME="loopfilter" -->
+					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_IF NAME="loopfilter"-->
+		
+		<table>
+			<tr>
+				<th>Rank/Biblioitemnumbers</th>
+				<!-- TMPL_LOOP NAME="loopcol" -->
+					<th colspan="2"><!-- TMPL_VAR NAME="coltitle" --></th>
+				<!-- /TMPL_LOOP -->
+			</tr>
+			<tr>
+				<th>&nbsp;</th>
+				<!-- TMPL_LOOP NAME="loopcol" -->
+					<th>Item</th>
+					<th>Issues count</th>
+				<!-- /TMPL_LOOP -->
+			</tr>
+				<!-- TMPL_LOOP NAME="looprow" -->
+					<!-- TMPL_IF NAME="hilighted" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+						<td>
+						<!-- TMPL_VAR NAME="rowtitle" --></td>
+						<!-- TMPL_LOOP NAME="loopcell" -->
+							<td>
+								<!-- TMPL_IF NAME="reference" --><a href="javascript:Dopop('../MARCdetail.pl?bib=<!-- TMPL_VAR NAME="reference" -->')" ><!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- TMPL_ELSE -->Item<!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="reference" --></a><!-- /TMPL_IF -->
+							</td>
+							<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="count" --><!-- TMPL_VAR NAME="count" --><!-- /TMPL_IF -->
+							</td>
+						<!-- /TMPL_LOOP -->
+					</tr>
+				<!-- /TMPL_LOOP NAME="looprow" -->
+		</table>
+	<!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+	<h1>Top List On Catalogue Issues  </h1>
+	<form method="post">
+	<div class="data">
+	<table>
+		<thead>
+			<tr>
+			<th><label for="Limit">Limit Number of Results: </label></th><td><select name="Limit" id="Limit">
+						<option value ="5" checked> 5</option>
+						<option value ="10">10</option>
+						<option value ="15">15</option>
+						<option value ="20">20</option>
+						<option value ="25">25</option>
+						<option value ="40">40</option>
+						<option value ="50">50</option>
+						<option value ="100">100</option>
+					</select></td>
+			</tr>
+			<tr><th><label for="Criteria">Limit By:</label> </th><td><select name="Criteria" id="Criteria">
+						<option value ="" checked>None</option>
+						<option value ="issuingbranch">Branch</option>
+						<option value ="categorycode">Categorycode</option>
+						<option value ="itemtype">Itemtype</option>
+						<option value ="Day">Day</option>
+						<option value ="Week">Week</option>
+						<option value ="Month">Month</option>
+						<option value ="Year">Year</option>
+					</select></td></tr>
+		</thead>
+		<tbody>
+			<tr><th>Issue date</th>
+				<td> From <input type="text" readonly="readonly" size="10" id="from" name="Filter" >
+							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+								<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 <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text">
+						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+							<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>
+				</td>
+			</tr>
+			<tr>
+				<th>Returns</th>
+				<td> From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" >
+							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
+								<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('toRO').value.split("-");
+										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+										if (date > limitDate) {
+											return true;
+										} else {
+											return false;
+										}
+									}
+					
+									Calendar.setup(
+										{
+											inputField : "fromRO",
+											ifFormat : "%Y-%m-%d",
+											button : "openCalendarFromRO",
+											disableFunc : validate1,
+											dateStatusFunc : validate1
+										}
+									);
+								</script>
+					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" >
+						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+							<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('fromRO').value.split("-");
+									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+									if (limitDate > date) {
+										return true;
+									} else {
+										return false;
+									}
+								}
+		
+								Calendar.setup(
+									{
+										inputField : "toRO",
+										ifFormat : "%Y-%m-%d",
+										button : "openCalendarToRO",
+										disableFunc : validate2,
+										dateStatusFunc : validate2
+									}
+								);
+							</script>
+				</td>
+			</tr>
+			<tr><th><label for="branch">Branch</label></th>
+				<td><input type="text" name="Filter" id="branch" value=""></td>
+			</tr>
+			<tr><th><label for="doctype">Document Type</label></th>
+				<td><input type="text" name="Filter" id="doctype" value=""></td>
+			</tr>
+			<tr><th><label for="borcat">Borrower Category</label></th>
+				<td><input type="text" name="Filter" id="borcat" value=""></td>
+			</tr>
+			<tr><th><label for="day">Day</label></th>
+				<td><input type="text" name="Filter" id="day" value=""></td>
+			</tr>
+			<tr><th><label for="month">Month</label></th>
+				<td><input type="text" name="Filter" id="month" value=""></td>
+			</tr>
+			<tr><th><label for="year">Year</label></th>
+				<td><input type="text" name="Filter" id="year" value=""></td>
+			</tr>
+		</tbody>
+	</table>
+	
+<table>
+	<caption>Output Options</caption>
+	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
+	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
+<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
+<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
+<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
+</table>
+		
+	<p>
+	<input type="submit" value="Generate Report" class="submit" />
+	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+	<input type="hidden" name="do_it" value="1" />
+	</form></p>
+	</div>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/catalogue_out.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/catalogue_out.tmpl
new file mode 100644
index 0000000000..f32116aa9d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/catalogue_out.tmpl
@@ -0,0 +1,105 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<div id="main">
+
+<!-- TMPL_IF NAME="do_it" -->
+	<!-- TMPL_LOOP NAME="mainloop" -->
+		<h1>Items with No Issues </h1>
+		<!-- TMPL_IF NAME="loopfilter"-->
+			<p>Filtered on</p>
+			<!-- TMPL_LOOP NAME="loopfilter" -->
+					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_IF NAME="loopfilter"-->
+		
+		<table>
+			<tr>
+				<th>Num/Items</th>
+				<!-- TMPL_LOOP NAME="loopcol" -->
+					<th><!-- TMPL_VAR NAME="coltitle" --></th>
+				<!-- /TMPL_LOOP -->
+			</tr>
+				<!-- TMPL_LOOP NAME="looprow" -->
+					<tr>
+						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+						<!-- TMPL_VAR NAME="rowtitle" --></td>
+						<!-- TMPL_LOOP NAME="loopcell" -->
+							<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td ><!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+							</td>
+						<!-- /TMPL_LOOP -->
+					</tr>
+				<!-- /TMPL_LOOP NAME="looprow" -->
+		</table>
+	<!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+	<h1>Koha : Items with no Issues </h1>
+	<form method="post">
+	
+	<table>
+		<thead>
+			<tr>
+			<th>Limit to </th>
+			<th>By </th>
+			<th colspan="2">Filters</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td>
+					<select name="Limit">
+						<option value ="" checked>None</option>
+						<option value ="5"> 5</option>
+						<option value ="10">10</option>
+						<option value ="15">15</option>
+						<option value ="20">20</option>
+						<option value ="25">25</option>
+						<option value ="40">40</option>
+						<option value ="50">50</option>
+						<option value ="100">100</option>
+					</select>
+				</td>
+				<td>
+					<select name="Criteria">
+						<option value ="" checked>None</option>
+						<option value ="homebranch">Branch</option>
+						<option value ="itemtype">Itemtype</option>
+					</select>
+				</td>
+				<td colspan="2">&nbsp;</td>
+			</tr>
+			<tr>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td>Branch</td>
+				<td><input type="text" name="Filter" value=""></td>
+			</tr>
+			<tr>
+				<td>&nbsp;</td>
+				<td>&nbsp;</td>
+				<td>Document Type</td>
+				<td><input type="text" name="Filter" value=""></td>
+			</tr>
+		</tbody>
+	</table>
+<div class="data">
+<table>
+	<caption>Output Options</caption>
+	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
+	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
+<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
+<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
+<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
+</table>
+		
+	<p>
+	<input type="submit" value="Generate Report" class="submit" />
+	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+	<input type="hidden" name="do_it" value="1" />
+	</form></p>
+	</div>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/catalogue_stats.tmpl
index d603ab8847..d780f487d2 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/catalogue_stats.tmpl
@@ -2,20 +2,20 @@
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-<div id="main">
+<div id="main" >
 
 <!-- TMPL_IF NAME="do_it" -->
 	<!-- TMPL_LOOP NAME="mainloop" -->
-		<h1>Koha : Catalogue statistics </h1>
+		<h1>Catalogue Statistics </h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_IF NAME="err" --> <font color="red"> <b><!--/TMPL_IF --><label> <!-- TMPL_VAR NAME="crit"--> =</label><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </font> </b><!--/TMPL_IF --></p>
+					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_IF NAME="loopfilter"-->
-		<br>
+		
 		<table>
-			<tr >
+			<tr>
 				<th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
 				<!-- TMPL_LOOP NAME="loopcol" -->
 					<th><!-- TMPL_VAR NAME="coltitle" --></th>
@@ -24,19 +24,21 @@
 			</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
 					<tr>
-						<!-- TMPL_IF NAME="highlighted" --><td class="highlighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="hilighted" --><td><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
 						<!-- TMPL_VAR NAME="rowtitle" --></td>
 						<!-- TMPL_LOOP NAME="loopcell" -->
-							<!-- TMPL_IF NAME="highlighted" --><td class="numberhighlighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-								<!-- TMPL_VAR NAME="value" -->
+							<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+								<!--TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" -->
+								<!--TMPL_ELSE-->&nbsp;
+								<!--/TMPL_IF-->
 							</td>
 						<!-- /TMPL_LOOP -->
-						<!-- TMPL_IF NAME="highlighted" --><td class="numberhighlighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
 							<!-- TMPL_VAR NAME="totalrow" -->
 						</td>
 					</tr>
 				<!-- /TMPL_LOOP NAME="looprow" -->
-				<tr >
+				<tr>
 					<th>TOTAL</th>
 					<!-- TMPL_LOOP NAME="loopfooter" -->
 						<th>
@@ -48,131 +50,99 @@
 		</table>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
-	<h1>Koha : Catalogue statistics</h1>
-	<form action="/cgi-bin/koha/reports/catalogue-stats.pl" method="post">
+	<form method="post" action="catalogue_stats.pl">
+	<div class="data">
 	<table>
-		<thead>
-			<tr>
-			<th>Title</th>
-			<th>Row</th>
-			<th>Column</th>
-			<th>Filter</th>
-			</tr>
-		</thead>
-		<tbody>
-			<!-- TMPL_IF Name="hasdewey" -->
-				<tr class="highlighted">
-					<td>Dewey Classification</td>
-					<td><input type="radio" name="Line" value="dewey"></td>
-					<td><input type="radio" name="Column" value="dewey"></td>
-					<td > From <!-- TMPL_VAR NAME="CGIFromDeweyClass" --> To <!-- TMPL_VAR NAME="CGIToDeweyClass" --></td>
-				</tr>
-				<tr class="highlighted">
-					<td>&nbsp;</td>
-					<td colspan="2"><select id="deweydigits" name="deweydigits">
+	<caption>Catalogue statistics</caption>
+			<!-- TMPL_IF Name="hasdewey" --><tr>
+				
+					<th>Display Dewey Number As:</th><td><label for="Line">Row</label> <input type="radio" name="Line" id="Line" value="dewey" /> <label for="Column">Column</label> <input type="radio" name="Column" id="Column" value="dewey" /></td></tr>
+				<tr><th>Limit by Dewey Number: </th><td><label for="Filter">From</label> <!-- TMPL_VAR NAME="CGIFromDeweyClass" --> <label for="Filter">To</label> <!-- TMPL_VAR NAME="CGIToDeweyClass" -->, Limit to: <select name="deweydigits">
 						<option value=""> </option>
 						<option value ="1">1</option>
 						<option value ="2">2</option>
 						<option value ="3">3</option>
 						<option value ="4">4</option>
 						<option value ="5">5</option>
-						</select>
-						digits 
-					</td>
-					<td>&nbsp;</td>
-				</tr>
-			<!-- /TMPL_IF -->
+						</select> digits</td>
+			</tr><!-- /TMPL_IF -->
+			
 			<!-- TMPL_IF Name="haslccn" -->
-				<!--TMPL_IF Name="hlghtlccn"--><tr class="highlighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-					<td>LoC Classification</td>
-					<td><input type="radio" name="Line" value="lccn"></td>
-					<td><input type="radio" name="Column" value="lccn"></td>
-					<td > From <!-- TMPL_VAR NAME="CGIFromLoCClass" --> To <!-- TMPL_VAR NAME="CGIToLoCClass" --></td>
-				</tr>
-				<!--TMPL_IF Name="hlghtlccn"--><tr class="highlighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-					<td>&nbsp;</td>
-					<td colspan="2"><select id="lccndigits" name="lccndigits">
+				<tr>
+					<th>Display LoC Number As:</th>
+					<td><label for="Line2">Row</label> <input type="radio" name="Line" id="Line2" value="lccn" /> <label for="Column2">Column</label> <input type="radio" id="Column2" name="Column" value="lccn" /></td></tr>
+					<tr><th>Limit by LoC Number: </th><td><label for="locfrom">From</label> <input type="text" id="locfrom" size="6" name="Filter" /> <label for="locto">To</label> <input id="locto" type="text" size="6" name="Filter" />, <label for="lccndigits">Limit to</label> <select name="lccndigits" id="lccndigits">
 						<option value=""> </option>
 						<option value ="1">1</option>
 						<option value ="2">2</option>
 						<option value ="3">3</option>
 						<option value ="4">4</option>
 						<option value ="5">5</option>
-						</select>
-						characters
-					</td>
-					<td>&nbsp;</td>
-				</tr>
+						</select> characters</td></tr>
 			<!-- /TMPL_IF  -->
 			<!-- TMPL_IF Name="hascote" -->
-				<!--TMPL_IF Name="hlghtcote"--><tr class="highlighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-					<td>Callnumber</td>
-					<td><input type="radio" name="Line" value="items.itemcallnumber"></td>
-					<td><input type="radio" name="Column" value="items.itemcallnumber"></td>
-					<td>From <!-- TMPL_VAR NAME="CGIFromCoteClass" --> To <!-- TMPL_VAR NAME="CGIToCoteClass" --></td>
-				</tr>
-				<!--TMPL_IF Name="hlghtcote"--><tr class="highlighted"> <!--TMPL_ELSE --><tr><!--/TMPL_IF-->
-					<td>&nbsp;</td>
-					<td colspan="2"><select id="cotedigits" name="cotedigits">
+<tr>
+					<th>Display Call Number As:</th>
+					<td><label for="Line3">Row</label> <input type="radio" name="Line" id="Line3" value="items.itemcallnumber"> <label for="Column3">Column</label> <input type="radio" name="Column" id="Column3" value="items.itemcallnumber" /></td></tr>
+					<th>Limit by Call Number</th><label for="cote">From</label> <!-- TMPL_VAR NAME="CGIFromCoteClass" --> To <!-- TMPL_VAR NAME="CGIToCoteClass" -->, <label for="cotedigits">Limit to</label> <select id="cotedigits" name="cotedigits">
 						<option value=""> </option>
 						<option value ="1">1</option>
 						<option value ="2">2</option>
 						<option value ="3">3</option>
 						<option value ="4">4</option>
 						<option value ="5">5</option>
-						</select>
-						characters 
-					</td>
-					<td>&nbsp;</td>
-				</tr>
+						</select> characters</td></tr>
 			<!-- /TMPL_IF -->
+			</table>
+			<!-- TMPL_UNLESS NAME="hasdewey --><input type="hidden" name="Filter" /> <input type="hidden" name="Filter" /><!-- /TMPL_UNLESS -->
+			<!-- TMPL_UNLESS NAME="haslccn --><input type="hidden" name="Filter" /> <input type="hidden" name="Filter" /><!-- /TMPL_UNLESS -->
+			<!-- TMPL_UNLESS NAME="hascote --><input type="hidden" name="Filter" /> <input type="hidden" name="Filter" /><!-- /TMPL_UNLESS -->
+			<table>
 			<tr>
-				<td>Document Type</td>
-				<td><input type="radio" name="Line" value="itemtype"></td>
-				<td><input type="radio" name="Column" value="itemtype"></td>
-				<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
-			</tr>
-			<tr class="highlighted" >
-				<td>Publisher</td>
-				<td><input type="radio" name="Line" value="publishercode"></td>
-				<td><input type="radio" name="Column" value="publishercode"></td>
-				<td><!-- TMPL_VAR NAME="CGIPublisher" --></td>
-			</tr>
-			<tr>
-				<td>Publication Year</td>
-				<td><input type="radio" name="Line" value="publicationyear"></td>
-				<td><input type="radio" name="Column" value="publicationyear"></td>
-				<td>From <input type="text" name="Filter" > To <input type="text" name="Filter" ></td>
+				<th>Display Item Type As:</th>
+				<td><label for="Line4">Row</label> <input type="radio" name="Line" id="Line4" value="itemtype" /> <label for="Column4">Column</label> <input type="radio" id="Column4" name="Column" value="itemtype" /></td></tr>
+				<tr><th><label for="itemtype">Limit by Item Type: </label></th><td><!-- TMPL_VAR NAME="CGIItemType" --></td></tr></table>
+<table>
+				<tr>
+				<th>Display Publisher As: </th>
+				<td><label for="Line5">Row</label> <input type="radio" name="Line" id="Line5" value="publishercode" /> <label for="Column5">Column</label> <input type="radio" name="Column" id="Column5" value="publishercode" /></td></tr>
+				<tr><th><label for="publisher">Limit by Publisher:</label> </th><td><input type="text" id="publisher" name="Filter" /></td>
 			</tr>
-			<tr class="highlighted" >
-				<td>Home Branch</td>
-				<td><input type="radio" name="Line" value="items.homebranch"></td>
-				<td><input type="radio" name="Column" value="items.homebranch"></td>
+</table>
+<table><tr>
+				<th>Display Publication Year As: </th><td><label for="Line6">Row</label> <input type="radio" name="Line" id="Line6" value="publicationyear" /> <label for="Column6">Column</label> <input type="radio" name="Column" id="Column6" value="publicationyear" /></td></tr>
+				<tr><th>Limit by Publication Year: </th><td><label for="fromyear">From</label> <input type="text" id="fromyear" name="Filter" size="4" maxlength="4" /> <label for="toyear">To</label> <input type="text" size="4" maxlength="4" id="toyear" name="Filter" /></td></tr>
+</table>
+<table>
+	<tr><th>Display Home Branch As: </th>
+				<td><label for="Line7">Row</label> <input type="radio" name="Line" id="Line7" value="items.homebranch" /> <label for="Column7">Column</label> <input type="radio" id="Column7" name="Column" value="items.homebranch" /></td></tr>
+				<tr><th><label for="branch">Limit By Home Branch:</label> </th>
 				<td><!-- TMPL_VAR NAME="CGIBranch" --></td>
-			</tr>
+			</tr></table>
+			<table>
 			<tr>
-				<td>Location</td>
-				<td><input type="radio" name="Line" value="items.location"></td>
-				<td><input type="radio" name="Column" value="items.location"></td>
-				<td><!-- TMPL_VAR NAME="CGILocation" --> </td>
+				<th>Display Location As: </th>
+				<td><label for="Line8">Row</label> <input type="radio" name="Line" id="Line8" value="items.location" /> <label for="Column8">Column</label> <input type="radio" name="Column" id="Column8" value="items.location" /></td></tr>
+			<tr><th><label for="location">Limit By Location: </label></th><td><!-- TMPL_VAR NAME="CGILocation" --> </td>
 			</tr>
-		</tbody>
 	</table>
 	
-	<div class="details">
-		<h3> Output </h3>
-		<input type="radio" checked name="output" value="screen" > To screen into the browser
-		<br>
-		<input type="radio" name="output" value="file"> To file <input type="text" name="basename" value="Export"> into an application  
-		<!-- TMPL_VAR NAME="CGIextChoice" -->
-		<!-- TMPL_VAR NAME="CGIsepChoice" -->
-	</p>
-	</div>
+<table>
+	<caption>Output Options</caption>
+	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked="checked" name="output" value="screen" id="screen" /></td></tr>
+	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
+<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></tr>
+<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
+<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
+</table>
+		
 	<p>
-	<input TYPE="submit" value="OK" class="submit">
-	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
-	<input type="hidden" name="do_it" value="1">
-	</form>
+	<input type="submit" value="Generate Report" class="submit" />
+	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+	<input type="hidden" name="do_it" value="1" /></p>
+	</div></form>
+	
 <!-- /TMPL_IF -->
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/inventory.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/inventory.tmpl
index 6cb1acd34b..c83614da44 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/reports/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/inventory.tmpl
@@ -3,97 +3,81 @@
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
 <div id="main">
-<h1>Inventory Report</h1>
-<form method="post">
-	<div class="table"><div class="details"><table>
+	<h1>Inventory Report</h1>
+	<form method="post">
+	<div class="data">
+	<table>
 	<caption>Select items you want to check</caption>
+	<tr><th><label for="minlocation">Item Location (items.itemcallnumber) between:</label></th><td><input type="text" name="minlocation" id="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" /> 
+			<label for="maxlocation">...and...</label>
+				<input type="text" name="maxlocation" id="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" /></td></tr>
+	<tr><th><label for="datelastseen">Not seen since:</label></th><td><input type="text" name="datelastseen" id="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" size="10" maxlength="10" /></td></tr>
+	<tr><th><label for="pagesize">Items per Page: </label></th><td><input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5" /></td></tr>
+	<tr><th><label for="offset">Beginning at Page: </label></th><td><input type="text" name="offset" id="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5" /></td></tr>
+	</table>
+		<p>
+			<input type="submit" value="Generate Report" class="submit">
+		</p>
+	</form>
+	<!-- TMPL_IF NAME="loop" -->
+	<form method="post">
+	<input type="hidden" name="markseen" value="1" />
+	<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" />
+	<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
+	<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
+	<input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
+	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" />
+	
+	<table>
 		<tr>
-			<th>Item Location (items.bulk) between:</th>
-			<td><input type="text" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->" /></td>
+			<th>Seen</th>
+			<th>Barcode</th>
+			<th>Call number</th>
+			<th>Title</th>
+			<th>Author</th>
 		</tr>
+	<!-- TMPL_LOOP NAME="loop" -->
 		<tr>
-		<th>...and:</th><td><input type="text" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->" /></td>
-		</tr>
-		<tr>
-			<th>Not seen since:</th>
 			<td>
-				<input type="text" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->" />
+				<input type="checkbox" name="SEEN-<!-- TMPL_VAR NAME="itemnumber" -->" value="1" />
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="barcode" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="itemcallnumber" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="title" -->
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="author" -->
 			</td>
 		</tr>
-		<tr>
-			<th>Show:</th>
-			<td><input type="text" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->" /></td>
-		</tr>
-		<tr><th>Beginning at offset: </th><td><input type="text" name="offset" value="<!-- TMPL_VAR name="offset" -->" /></td></tr>
-	</table><input type="submit" value="Submit" class="submit" /></div></div>
-</form>
-
-<form method="post">
-<input type="hidden" name="markseen" value="1" />
-<input type="hidden" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->" />
-<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->" />
-<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->" />
-<input type="hidden" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->" />
-<input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->" />
-<!-- TMPL_IF name="loop" -->
-<table width="100%">
-	<tr>
-		<th>Seen</th>
-		<th>Barcode</th>
-		<th>Bulk</th>
-		<th>Title</th>
-		<th>Author</th>
-	</tr>
-<!-- TMPL_LOOP name="loop" -->
-	<tr>
-		<td>
-			<input type="checkbox" name="SEEN-<!-- TMPL_VAR name="itemnumber" -->" value="1" />
-		</td>
-		<td>
-			<!-- TMPL_VAR name="barcode" -->
-		</td>
-		<td>
-			<!-- TMPL_VAR name="bulk" -->
-		</td>
-		<td>
-			<!-- TMPL_VAR name="title" -->
-		</td>
-		<td>
-			<!-- TMPL_VAR name="author" -->
-		</td>
-	</tr>
-<!-- /TMPL_LOOP -->
-</table>
-<input type="submit" value="Mark seen" class="submit" />
-</form>
-<!-- /TMPL_IF -->
-
-<table>
-<tr>
-	<td>
-		<!-- TMPL_IF name="offset" -->
-		<form method="post">
-			<input type="hidden" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->" />
-			<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->" />
-			<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->" />
-			<input type="hidden" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->" />
-			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="prevoffset" -->" />
-			<input type="submit" value="&lt;&lt;&lt;" class="submit" />
-		</form>
-		<!-- /TMPL_IF -->
-	</td>
-	<td>
-		<!-- TMPL_IF name="nextoffset" -->
-		<form method="post">
-			<input type="hidden" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->" />
-			<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->" />
-			<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->" />
-			<input type="hidden" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->" />
-			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="nextoffset" -->" />
-			<input type="submit" value="&gt;&gt;&gt;" class="submit" />
-		</form>
-		<!-- /TMPL_IF -->
-	</td>
-</tr>
-</table></div>
+	<!-- /TMPL_LOOP -->
+	</table>
+	<input type="submit" value="Mark seen" class="submit">
+	</form>
+	
+	<!-- TMPL_IF NAME="offset" -->
+	<form method="post">
+		<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" />
+		<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" /> 
+		<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
+		<input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
+		<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevoffset" -->" />
+		<input type="submit" value="&lt;&lt;&lt;" class="submit" />
+	</form>
+	<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="nextoffset" -->
+	<form method="post">
+		<input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->" /> 
+		<input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->" />
+		<input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->" />
+		<input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" />
+		<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextoffset" -->" />
+		<input type="submit" value="&gt;&gt;&gt;" class="submit" />
+	</form>
+	<!-- /TMPL_IF --><!-- /TMPL_IF -->
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/issues_avg_stats.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/issues_avg_stats.tmpl
new file mode 100644
index 0000000000..e506470770
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/issues_avg_stats.tmpl
@@ -0,0 +1,280 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<div id="main">
+
+<!-- TMPL_IF NAME="do_it" -->
+	<!-- TMPL_LOOP NAME="mainloop" -->
+		<h1>Koha : Issues Average Period statistics </h1>
+		<!-- TMPL_IF NAME="loopfilter"-->
+			<p>Filtered on</p>
+			<!-- TMPL_LOOP NAME="loopfilter" -->
+					<p><!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --><strong><!-- TMPL_VAR NAME="crit"--> =</strong><!-- TMPL_VAR NAME="filter"--><!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF --></p>
+			<!-- /TMPL_LOOP -->
+		<!-- /TMPL_IF NAME="loopfilter"-->
+		
+		<table>
+			<tr>
+				<th><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
+				<!-- TMPL_LOOP NAME="loopcol" -->
+					<th><!-- TMPL_VAR NAME="coltitle" --></th>
+				<!-- /TMPL_LOOP -->
+				<th>TOTAL</th>
+			</tr>
+				<!-- TMPL_LOOP NAME="looprow" -->
+					<tr>
+						<!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+						<!-- TMPL_VAR NAME="rowtitle" --></td>
+						<!-- TMPL_LOOP NAME="loopcell" -->
+							<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
+							</td>
+						<!-- /TMPL_LOOP -->
+						<!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+							<!-- TMPL_VAR NAME="totalrow" -->
+						</td>
+					</tr>
+				<!-- /TMPL_LOOP NAME="looprow" -->
+				<tr>
+					<th>TOTAL</th>
+					<!-- TMPL_LOOP NAME="loopfooter" -->
+						<th>
+							<!-- TMPL_VAR NAME="totalcol" -->
+						</th>
+					<!-- /TMPL_LOOP -->
+					<th><!-- TMPL_VAR NAME="total" --></th>
+				</tr>
+		</table>
+	<!-- /TMPL_LOOP -->
+<!-- TMPL_ELSE -->
+	<h1>Koha : Issues Average Period statistics </h1>
+	<form method="post">
+	<div class="data">
+	<table>
+		<thead>
+			<tr>
+			<th scope="col">Title</th>
+			<th scope="col">Row</th>
+			<th scope="col">Column</th>
+			<th scope="col">Filter</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr class="hilighted">
+				<td>Issue date</td>
+				<td><input type="radio" name="Line" value="timestamp"></td>
+				<td><input type="radio" name="Column" value="timestamp"></td>
+				<td > From <input type="text" readonly="readonly" size="10" id="from" name="Filter" >
+							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
+								<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 <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text">
+						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+							<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>
+				</td>
+			</tr>
+			<tr class="hilighted"> 
+				<td>&nbsp;</td>
+				<td colspan="2">by <select name="IssueDisplay">
+					<option value=""> </option>
+					<option value ="1">Day</option>
+					<option value ="2">Month</option>
+					<option value ="3">Year</option>
+					</select>
+					
+				</td>
+				<td><!--Preparing Month and Day Selection--><input type="hidden" name="Filter" value=""><input type="hidden" name="Filter" value=""></td>
+			</tr>
+			<tr>
+				<td>Returns</td>
+				<td><input type="radio" name="Line" value="returndate"></td>
+				<td><input type="radio" name="Column" value="returndate"></td>
+				<td > From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" >
+							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
+								<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('toRO').value.split("-");
+										var limitDate = new Date(dateTo[0], (dateTo[1] - 1), dateTo[2]);
+										if (date > limitDate) {
+											return true;
+										} else {
+											return false;
+										}
+									}
+					
+									Calendar.setup(
+										{
+											inputField : "fromRO",
+											ifFormat : "%Y-%m-%d",
+											button : "openCalendarFromRO",
+											disableFunc : validate1,
+											dateStatusFunc : validate1
+										}
+									);
+								</script>
+					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" >
+						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+							<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('fromRO').value.split("-");
+									var limitDate = new Date(dateFrom[0], (dateFrom[1] - 1), dateFrom[2]);
+									if (limitDate > date) {
+										return true;
+									} else {
+										return false;
+									}
+								}
+		
+								Calendar.setup(
+									{
+										inputField : "toRO",
+										ifFormat : "%Y-%m-%d",
+										button : "openCalendarToRO",
+										disableFunc : validate2,
+										dateStatusFunc : validate2
+									}
+								);
+							</script>
+				</td>
+			</tr>
+			<tr> 
+				<td>&nbsp;</td>
+				<td colspan="2">by <select name="ReturnDisplay">
+					<option value=""> </option>
+					<option value ="1">Day</option>
+					<option value ="2">Month</option>
+					<option value ="3">Year</option>
+					</select>
+					
+				</td>
+				<td><input type="hidden" name="Filter" value=""><input type="hidden" name="Filter" value=""></td>
+			</tr>
+			<tr class="hilighted">
+				<td>Borrower Category</td>
+				<td><input type="radio" name="Line" value="borrowers.categorycode"></td>
+				<td><input type="radio" name="Column" value="borrowers.categorycode"></td>
+				<td><!-- TMPL_VAR NAME="CGIBorCat" --></td>
+			</tr>
+			<tr>
+				<td>Document Type</td>
+				<td><input type="radio" name="Line" value="itemtype"></td>
+				<td><input type="radio" name="Column" value="itemtype"></td>
+				<td ><!-- TMPL_VAR NAME="CGIItemType" --></td>
+			</tr>
+			<tr class="hilighted">
+				<td>Branch</td>
+				<td><input type="radio" name="Line" value="branchcode"></td>
+				<td><input type="radio" name="Column" value="branchcode"></td>
+				<td><!-- TMPL_VAR NAME="CGIBranch" --></td>
+			</tr>
+<!-- Modified according to statistics table
+			<tr>
+				<td>Issuing Branch</td>
+				<td><input type="radio" name="Line" value="issuingbranch"></td>
+				<td><input type="radio" name="Column" value="issuingbranch"></td>
+				<td ><! TMPL_VAR NAME="CGIBranch" ></td>
+			</tr> -->
+			<input type="hidden" name="Filter" value="">
+<!--End Modified -->
+			<!-- TMPL_IF Name="hassort1" -->
+				<tr class="hilighted"> 
+					<td>Sort1</td>
+					<td><input type="radio" name="Line" value="borrowers.sort1"></td>
+					<td><input type="radio" name="Column" value="borrowers.sort1"></td>
+					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
+				</tr>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF Name="hassort2" -->
+				<!-- TMPL_IF Name="HglghtSort2"--><tr class="hilighted"> <!-- TMPL_ELSE --><tr><!--/TMPL_IF --> 
+					<td>Sort2</td>
+					<td><input type="radio" name="Line" value="borrowers.sort2"></td>
+					<td><input type="radio" name="Column" value="borrowers.sort2"></td>
+					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
+				</tr>
+			<!-- /TMPL_IF -->
+			<tr></tr>
+		</tbody>
+	</table>
+	
+<table>
+	<caption>Output Options</caption>
+	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
+	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
+<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
+<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
+<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
+</table>
+		
+	<p>
+	<input type="submit" value="Generate Report" class="submit" />
+	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+	<input type="hidden" name="do_it" value="1" />
+	</form></p>
+	</div>
+<!-- /TMPL_IF -->
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/issues_by_borrower_category.tmpl
index 5400d6143a..0173c91dfd 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/reports/issues_by_borrower_category.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/issues_by_borrower_category.tmpl
@@ -1,43 +1,43 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-
 <div id="main">
 <!-- TMPL_IF name="do_it" -->
 <!-- TMPL_LOOP name="mainloop" -->
 	<h1>Koha : Issues by borrower category <!--TMPL_IF name="borrower_category" --> for category = <!-- TMPL_VAR name="borrower_category" --><!-- /TMPL_IF --></h1>
-	<table>
+	<div class="data"><table>
 		<tr>
 			<th>&nbsp;</th>
 			<!-- TMPL_LOOP name="categorycodeloop" -->
-				<th><!-- TMPL_VAR name="categorycode" --></th>
+				<th scope="col"><!-- TMPL_VAR name="categorycode" --></th>
 			<!-- /TMPL_LOOP -->
 			<th>TOTAL</th>
 		</tr>
 			<!-- TMPL_LOOP name="loopborrowertype" -->
-				<tr>
+				<!-- TMPL_IF NAME="hilighted" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 					<td>
 					<!-- TMPL_VAR name="itemtype" --></td>
 					<!-- TMPL_LOOP name="loopitemtype" -->
-						<td>
+						<td class="sum">
 							<!-- TMPL_VAR name="issues" -->
 						</td>
 					<!-- /TMPL_LOOP -->
-					<td>
+					<td class="sum">
 						<!-- TMPL_VAR name="totalitemtype" -->
 					</td>
 				</tr>
 			<!-- /TMPL_LOOP name="loopitemtype" -->
+			<tfoot>
 			<tr>
-				<th>TOTAL</th>
+				<td>TOTAL</td>
 				<!-- TMPL_LOOP name="loopborrowertotal" -->
-					<th>
+					<td class="sum">
 						<!-- TMPL_VAR name="issues" -->
-					</th>
+					</td>
 				<!-- /TMPL_LOOP -->
-				<th><!-- TMPL_VAR NAME="grantotal" --></th>
-			</tr>
-	</table>
+				<td>&nbsp;</td>
+			</tr></tfoot>
+	</table></div>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
 	<h1>Issues by patron category</h1>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/issues_stats.tmpl
new file mode 100644
index 0000000000..feaa7525a8
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/issues_stats.tmpl
@@ -0,0 +1,255 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Reports: Issues Statistics<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
+
+<div id="main" >
+
+<!-- TMPL_IF NAME="do_it" -->
+	<!-- TMPL_LOOP NAME="mainloop" -->
+		<h1>Issues Statistics Report</h1>
+		<!-- TMPL_IF NAME="loopfilter"-->
+			<p>Showing Issues where 
+			<!-- TMPL_LOOP NAME="loopfilter" -->
+					<!-- TMPL_IF NAME="err" --> <span class="error"> <b><!--/TMPL_IF --> <strong><!-- TMPL_VAR NAME="crit"--></strong> = <span class="ex"><!-- TMPL_VAR NAME="filter"--></span>, <!-- TMPL_IF NAME="err" --> </span> </b><!--/TMPL_IF -->
+			<!-- /TMPL_LOOP --></p>
+		<!-- /TMPL_IF NAME="loopfilter"-->
+	
+		<table> 
+			<tr>
+				<th scope="col"><!-- TMPL_VAR name="line" --> / <!-- TMPL_VAR name="column" --></th>
+				<!-- TMPL_LOOP NAME="loopcol" -->
+					<th scope="col"><!-- TMPL_VAR NAME="coltitle" --></th>
+				<!-- /TMPL_LOOP -->
+				<th scope="col">Total</th>
+			</tr>
+				<!-- TMPL_LOOP NAME="looprow" -->
+					<!-- TMPL_IF NAME="hilighted" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+						<td>
+						<!-- TMPL_VAR NAME="rowtitle" --></td>
+						<!-- TMPL_LOOP NAME="loopcell" -->
+							<td class="sum">
+								<!-- TMPL_IF NAME="value" --><!-- TMPL_VAR NAME="value" -->
+								<!-- TMPL_ELSE --> &nbsp;
+								<!-- /TMPL_IF -->
+							</td>
+						<!-- /TMPL_LOOP -->
+						<td class="sum">
+							<!-- TMPL_VAR NAME="totalrow" -->
+						</td>
+					</tr>
+				<!-- /TMPL_LOOP NAME="looprow" -->
+				<tr>
+					<td>TOTAL</td>
+					<!-- TMPL_LOOP NAME="loopfooter" -->
+						<td class="sum">
+							<!-- TMPL_VAR NAME="totalcol" -->
+						</td>
+					<!-- /TMPL_LOOP -->
+					<td class="sum"><!-- TMPL_VAR NAME="total" --></td>
+				</tr>
+		</table>
+	<!-- /TMPL_LOOP -->
+	
+<!-- TMPL_ELSE -->
+	<h1>Build Issues Statistics Report</h1>
+	<div class="help">Choose at least one piece of information to display as a row in the report, and one to display as a column.</div>
+	<form method="post">
+	<div class="data">
+	<table>
+		<caption>Date Range</caption>
+		<thead>
+			<tr>
+			<th scope="col">Display as Row</th>
+			<th scope="col">Display as Column</th>
+			<th scope="col">From...</th>
+			<th scope="col">...To</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td><input type="radio" name="Line" value="datetime" /></td>
+				<td><input type="radio" name="Column" value="datetime" /></td>
+				<td><input type="text" size="10" id="from" name="Filter" />
+							<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top" />
+								<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></td><td>
+					<input size="10" id="to" name="Filter" value="" type="text" />
+						<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" style="cursor: pointer;" valign="top" border="0" />
+							<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>
+				</td>
+			</tr>
+			</table>
+			<table>
+			<caption>Transaction Type</caption>
+			<thead><tr><th scope="col">Type</th><th scope="col">Group By</th><th scope="col">Limit by Day of Week</th><th scope="col">Limit by Month</th></tr></thead>
+			<tr> 
+				<td><select id="PeriodTypeSel" name="PeriodTypeSel">
+					<option value ="issue">Issue</option>
+					<option value ="return">Return</option>
+					</select></td>
+				<td><select id="DisplayBy" name="DisplayBy">
+					<option value="">None</option>
+					<option value ="1">Day of week</option>
+					<option value ="2">Month</option>
+					<option value ="3">Year</option>
+					</select>
+					
+				</td>
+				<td><select id="PeriodDaySel" name="PeriodDaySel">
+					<option value =""></option>
+					<option value ="Monday">Monday</option>
+					<option value ="Tuesday">Tuesday</option>
+					<option value ="Wednesday">Wednesday</option>
+					<option value ="Thursday">Thursday</option>
+					<option value ="Friday">Friday</option>
+					<option value ="Saturday">Saturday</option>
+					<option value ="Sunday">Sunday</option>
+					</select></td>
+					
+					<td><select id="PeriodMonthSel" name="PeriodMonthSel">
+					<option value =""></option>
+					<option value ="January">January</option>
+					<option value ="February">February</option>
+					<option value ="March">March</option>
+					<option value ="April">April</option>
+					<option value ="May">May</option>
+					<option value ="June">June</option>
+					<option value ="July">July</option>
+					<option value ="August">August</option>
+					<option value ="September">September</option>
+					<option value ="October">October</option>
+					<option value ="November">November</option>
+					<option value ="December">December</option>
+					</select>
+				</td>
+			</tr>
+			</table>
+			<table>
+			<caption>Patron Category</caption>
+			<thead><tr>
+			<th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Category</th></tr></thead>
+				<td><input type="radio" name="Line" value="borrowers.categorycode" /></td>
+				<td><input type="radio" name="Column" value="borrowers.categorycode" /></td>
+				<td><!-- TMPL_VAR NAME="CGIBorCat" --></td>
+			</tr>
+			</table>
+			<table>
+			<caption>Item Type</caption>
+			<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Item Type</th></tr></thead>
+			<tr>
+				<td><input type="radio" name="Line" value="itemtype" /></td>
+				<td><input type="radio" name="Column" value="itemtype" /></td>
+				<td><!-- TMPL_VAR NAME="CGIItemType" --></td>
+			</tr>
+			</table>
+			
+			<table>
+			<caption>Branch</caption>
+			<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Branch</th></tr></thead>
+			<tr>
+				<td><input type="radio" name="Line" value="branch" /></td>
+				<td><input type="radio" name="Column" value="branch" /></td>
+				<td><!-- TMPL_VAR NAME="CGIBranch" --></td>
+			</tr>
+			</table>
+			
+			<!-- TMPL_IF Name="hassort1" -->
+			<table>
+				<caption>Sorting Field 1</caption>
+				<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Sorting Field 1</th></tr></thead>
+				<tr> 
+					<td><input type="radio" name="Line" value="borrowers.sort1" /></td>
+					<td><input type="radio" name="Column" value="borrowers.sort1" /></td>
+					<td><!-- TMPL_VAR NAME="CGISort1" --> </td>
+				</tr>
+				</table>
+			<!-- /TMPL_IF -->
+			
+			<!-- TMPL_IF Name="hassort2" -->
+			<table>
+				<caption>Sorting Field 2</caption>
+				<thead><tr><th scope="col">Display as Row</th><th scope="col">Display as Column</th><th scope="col">Limit by Sorting Field 2</th></tr></thead>
+				<tr> 
+					<td><input type="radio" name="Line" value="borrowers.sort2" /></td>
+					<td><input type="radio" name="Column" value="borrowers.sort2" /></td>
+					<td><!-- TMPL_VAR NAME="CGISort2" --> </td>
+				</tr>
+				</table>
+			<!-- /TMPL_IF -->
+	
+		<table>
+		<caption> Cell value</caption>
+		<tr><th><label for="count">Count issues</label></th><td><input type="radio" id="count" name="Cellvalue" value="1" checked="checked" /></td></tr>
+		<tr><th><label for="rate">Circulation rate</label></th><td><input type="radio" id="rate" name="Cellvalue" value="3" /></td></tr>
+		</table>
+
+<table>
+	<caption>Output Options</caption>
+	<tr><td colspan="2"><label for="screen">To the Screen</label> <input type="radio" checked name="output" value="screen" id="screen" /></td></tr>
+	<tr><td colspan="2"><label for="file">To file a file</label><input type="radio" name="output" value="file" id="file" /></td></tr>
+<tr><td>&nbsp;</td><td><label for="basename">...named:</label>   <input type="text" id="basename" name="basename" value="Export" /></td></td></tr>
+<tr><td>&nbsp;</td><td><label for="MIME">File Format:</label> <!-- TMPL_VAR NAME="CGIextChoice" --></td></tr>
+<tr><td>&nbsp;</td><td><label for="sep">Delimiter:</label> <!-- TMPL_VAR NAME="CGIsepChoice" --></td></tr>
+</table>
+		
+	<p>
+	<input type="submit" value="Generate Report" class="submit" />
+	<input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->" />
+	<input type="hidden" name="do_it" value="1" />
+	</form></p>
+	</div>
+<!-- /TMPL_IF -->
+</div>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/itemtypes.tmpl
index 96a6eb1c81..5bf31389db 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/reports/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/itemtypes.tmpl
@@ -4,22 +4,23 @@
 <div id="main">
 <!-- TMPL_IF name="do_it" -->
 <!-- TMPL_LOOP name="mainloop" -->
-	<div class="table"><table>
-	<caption>Item counts <!--TMPL_IF name="branch" --> for <!-- TMPL_VAR name="branch" --><!-- /TMPL_IF --></caption>
+	<table>
+	<caption>Item Counts <!--TMPL_IF name="branch" --> for <!-- TMPL_VAR name="branch" --><!-- /TMPL_IF --></caption>
 		<tr>
 			<th>Item Type</th>
-			<th>Item Count</th>
+			<th>Count</th>
 		</tr>
 			<!-- TMPL_LOOP name="loopitemtype" -->
-				<tr>
+				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
 					<td><!-- TMPL_VAR name="itemtype" --></td>
-					<td><!-- TMPL_VAR name="count" --></td>
+					<td class="credit"><!-- TMPL_VAR name="count" --></td>
 				</tr>
 			<!-- /TMPL_LOOP name="loopitemtype" -->
-			<tr>
-				<th>TOTAL</th>
-				<th><!-- TMPL_VAR name="total" --></th>
-	</table></div>
+			<tfoot><tr>
+				<td>TOTAL</td>
+				<td class="credit"><!-- TMPL_VAR name="total" --></td>
+				</tr></tfoot>
+	</table>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
 	<h1>Item Type Report</h1>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl
index 67f7c49694..6de29f111b 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl
@@ -2,31 +2,53 @@
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
 
-
-<div id="main"><h1>Reports</h1>
+<div id="main">
+<h1>Reports</h1>
 <div class="details">
-	<h2>Patron Statistics</h2>
+<h2>Statistics Wizards</h2>
 	<ul>
+		<li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
 		<li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Borrowers</a></li>
+		<li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></li>
+		<li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
 	</ul>
+</div>
+
 	<h2>Catalog Statistics</h2>
+<div class="details">
+	<ul>
+		<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
+		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
+	</ul>
+</div>
+
+<h2>Top Lists</h2>
+<div class="details">
+		<ul>
+		<li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Most issuing Borrowers</a></li>
+		<li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Most issued items</a></li>
+	</ul>
+</div>
+
+<h2>Inactive</h2>
+<div class="details">
 	<ul>
-		<li><a href="/cgi-bin/koha/reports/catalogue-stats.pl">Catalog Statistics</a></li>
-		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalog by Itemtype</a></li>
+		<li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Borrowers without issues</a></li>
+		<li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items not issued</a></li>
 	</ul>
-	<h2>Statistics on Issues</h2>
+</div>
+
+	<h2>Circulation Statistics</h2>
+<div class="details">
 	<ul>
 		<li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconciliation:</a> Daily Report (yesterday)</li>
 		<li><a href="/cgi-bin/koha/stats.pl?time=today">Till Reconciliation:</a> Daily Report (today)</li>
 		<li><a href="/cgi-bin/koha/overdue.pl">Overdue items</a></li>
-		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues by Borrower Bategory</a></li>
+		<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues by borrower category</a></li>
+		<li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>
 	</ul>
 </div>
-<div class="details">
-	<h2>Data Exports</h2>
-		<li>Unfinished</li>
-</div>
+
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
diff --git a/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
index edb578a241..d81161f415 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl
@@ -45,6 +45,13 @@
 			<input type="hidden" name="operator" value="contains" />  
 			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" accesskey="s" /></td>
 		</tr>
+<tr><th><label for="seriestitle">Series title</label></th><td>			
+			<input type="hidden" name="marclist" value="biblio.seriestitle" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" id="seriestitle" name="value" size="35"/></td></tr>
+	</table><input type="submit" value="Start search" class="submit" /><table>
 		<tr>
 			<th><label for="itemtype">Item Type</label></th>
 			<td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
@@ -55,7 +62,7 @@
 		</tr>
 		<tr>
 				<th><label for="branch">Branch</label></th>
-				<td><input type="hidden" name="marclist" value="items.holdingbranch" />
+				<td><input type="hidden" name="marclist" value="items.homebranch" />
 				<input type="hidden" name="and_or" value="and" />
 				<input type="hidden" name="excluding" value="" />
 				<input type="hidden" name="operator" value="=" />  
@@ -94,6 +101,7 @@
 			<input type="text" id="publisher" name="value" onchange="sql_update()" size="35"  accesskey="p" /></td>
 		</tr>
 		</table>
+		<input type="submit" value="Start search" class="submit" />
 </div>
 
 <div class="table">
@@ -144,11 +152,16 @@
 				<option value="biblioitems.dewey">Dewey</option>
 				<option value="biblioitems.publicationyear">Publication Year</option>
 				<option value="biblioitems.publishercode">Publisher</option>
-			</select></td>
+			</select>
+			<select name="desc_or_asc" size="1">
+				<option value="ASC">Ascending</option>
+				<option value="DESC">Descending</option>
+			</select>
+			</td>
 		</tr></table>
 		<p>
-			<input type="submit" value="Start search" class="submit">
-			<input type="button" value="Suggest Search Term" class="submit" onclick="PopupSuggestion(); return false;">
+			<input type="submit" value="Start search" class="submit" />
+			<input type="button" value="Suggest Search Term" class="submit" onclick="PopupSuggestion(); return false;" />
 		</p>
 		</div>
 	</form>
diff --git a/koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl b/koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl
index 6023e19041..77b8014724 100644
--- a/koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/z3950/searchresult.tmpl
@@ -1,17 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <title>Z39.50 Search Results</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<!-- TMPL_IF name="refresh" -->
-	<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->">
-<!-- /TMPL_IF -->
-</title>
+<meta http-equiv="refresh" content="2; url=<!-- TMPL_VAR NAME="refresh" -->" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="/intranet-tmpl/npl/en/includes/favicon.ico" type="image/x-icon" />
+<style type="text/css"> 
+	@import url(/intranet-tmpl/npl/en/includes/intranet.css);
+</style>
 </head>
 <body>
-<h3>Z3950 Search Results</h3>
+
+<div id="main-compact">
+	<h2>Z3950 Search Results</h2>
+	
+	<!-- TMPL_IF NAME="breeding_loop" -->
 <table>
-<caption>Bibliographic Records Found</caption>
 	<tr>
 		<th>Title</th>
 		<th>Author</th>
@@ -20,28 +25,27 @@
 		<th>&nbsp;</th>
 		<th>&nbsp;</th>
 	</tr>
-	<!-- TMPL_IF name="breeding_loop" -->
-	<!-- TMPL_LOOP name="breeding_loop" -->
+				<!-- TMPL_LOOP NAME="breeding_loop" -->
 		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
-			<td><!-- TMPL_VAR NAME="title" --></a>
+						<td><!-- TMPL_VAR NAME="title" --></td>
 			<td><!-- TMPL_VAR NAME="author" --></td>
 			<td><!-- TMPL_VAR NAME="isbn" --></td>
 			<td><!-- TMPL_VAR NAME="file" --></td>
 			<td><a href="javascript:Import(<!-- TMPL_VAR NAME="id" -->)">Import this biblio</a></td>
 		</tr>
 	<!-- /TMPL_LOOP -->
+		</table>
 	<!-- TMPL_ELSE -->
-		<tr><td colspan="6">Nothing found</td></tr>
+				<p>Nothing found</p>
 	<!-- /TMPL_IF -->
-</table>
-<!-- TMPL_IF name="numberpending" --><h3 align="center">Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h3><!-- /TMPL_IF -->
-<script language="JavaScript" type="text/javascript">
+	<!-- TMPL_IF NAME="numberpending" --><h1>Still <!-- TMPL_VAR NAME="numberpending" --> requests to go</h1><!-- /TMPL_IF -->
+	<script language="javascript" type="text/javascript">
 	function Import(GetThisOne) {
 		opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
 		self.close();
 		return false;
 	}
 </script>
-<!-- TMPL_INCLUDE name="acquisitions-bottom.inc" -->
+</div>
 </body>
 </html>
\ No newline at end of file
-- 
2.20.1