From 18a6bad8ab949dcb1f97c1fe391b1eee5e0ad147 Mon Sep 17 00:00:00 2001
From: hdl <hdl>
Date: Wed, 10 Aug 2005 14:22:48 +0000
Subject: [PATCH] Minor display changes. Now displaying publicationyear. And
 biblio information in One cell.

---
 C4/Acquisition.pm                             |  6 ++---
 .../default/en/acqui/lateorders.tmpl          | 22 +++++++------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 639d3cffb9..bc72015de9 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -572,13 +572,13 @@ sub getlateorders {
 #BEWARE, order of parenthesis and LEFT JOIN is important for speed 
 	my $strsth;
 	my $dbdriver = C4::Context->config("db_scheme")||"mysql";
-	warn " $dbdriver";
+#	warn " $dbdriver";
 	if ($dbdriver eq "mysql"){
 		$strsth ="SELECT aqbasket.basketno,
 					DATE(aqbasket.closedate) as orderdate, aqorders.quantity, aqorders.rrp as unitpricesupplier,aqorders.ecost as unitpricelib,
 					aqorders.quantity * aqorders.rrp as subtotal, aqbookfund.bookfundname as budget, borrowers.branchcode as branch,
 					aqbooksellers.name as supplier,
-					biblio.title, biblio.author, biblioitems.publishercode as publisher,
+					biblio.title, biblio.author, biblioitems.publishercode as publisher, biblioitems.publicationyear,
 					DATEDIFF(CURDATE( ),closedate) AS latesince
 					FROM 
 						((	(
@@ -598,7 +598,7 @@ sub getlateorders {
 					aqorders.quantity, aqorders.rrp as unitpricesupplier,aqorders.ecost as unitpricelib, aqorders.quantity * aqorders.rrp as subtotal
 					aqbookfund.bookfundname as budget, borrowers.branchcode as branch,
 					aqbooksellers.name as supplier,
-					biblio.title, biblio.author, biblioitems.publishercode as publisher,
+					biblio.title, biblio.author, biblioitems.publishercode as publisher, biblioitems.publicationyear,
 					(CURDATE -  closedate) AS latesince
 					FROM 
 						((	(
diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl
index f37131617e..c79922a111 100644
--- a/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl
@@ -6,11 +6,9 @@
 		<tr>
 			<th class="acquisition">Supplier</th>
 			<th class="acquisition">Order Date</th>
-			<th class="acquisition">Late since</th>
+			<th class="acquisition">Ordered for</th>
 			<th class="acquisition">Including Basket</th>
-			<th class="acquisition">Title</th>
-			<th class="acquisition">Author</th>
-			<th class="acquisition">Publisher</th>
+			<th class="acquisition">Book information</th>
 			<th class="acquisition">Branch</th>
 			<th class="acquisition">Estimated Unit Price</th>
 			<th class="acquisition">Retailer Catalogue Unit Price</th>
@@ -25,10 +23,10 @@
 					<!-- TMPL_VAR name="CGIsupplier" -->
 				</td>
 				<td> &nbsp;</td>
-				<td>
-					<input type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->"> days
+				<td align="center">
+					<input align="right" size="4" maxlength="3" type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->"> days
 				</td>
-				<td colspan="4">
+				<td colspan="2">
 					&nbsp;
 				</td>
 				<td>
@@ -58,13 +56,9 @@
 					<!-- TMPL_VAR name="basketno" -->
 				</td>
 				<td>
-					<!-- TMPL_VAR name="title" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR name="author" -->
-				</td>
-				<td>
-					<!-- TMPL_VAR name="publisher" -->
+					<b><!-- TMPL_VAR name="title" --></b>
+				<!-- TMPL_IF name="author" --><br/><i>Author:</i> <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
+				<!-- TMPL_IF name="publisher" --><br/><i>Published by:</i> <!-- TMPL_VAR NAME="publisher" --><!-- TMPL_IF name="publicationyear" --><i> in </i><!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 				</td>
 				<td>
 					<!-- TMPL_VAR name="branch" -->
-- 
2.39.5