From c64322e48de53ed64d65f8c86160848a492ea792 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Wed, 28 Dec 2011 15:43:47 +1300
Subject: [PATCH] Bug 929 : Follow up, making some improvements to the spent
 page More to come

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
---
 acqui/spent.pl                                    |  3 ++-
 .../intranet-tmpl/prog/en/modules/acqui/spent.tt  | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/acqui/spent.pl b/acqui/spent.pl
index 80a89d3dd7..2cfe7b4c83 100755
--- a/acqui/spent.pl
+++ b/acqui/spent.pl
@@ -57,7 +57,7 @@ my $query = <<EOQ;
 SELECT
     aqorders.basketno, aqorders.ordernumber,
     quantity-quantityreceived AS tleft,
-    ecost, budgetdate,
+    ecost, budgetdate, entrydate,
     aqbasket.booksellerid,
     itype,
     title,
@@ -115,6 +115,7 @@ $template->param(
     spent       => \@spent,
     total       => $total
 );
+$template->{VARS}->{'fund'} = $bookfund;
 $sth->finish;
 
 $dbh->disconnect;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
index 4bd095fa2c..78f7cb5a36 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
@@ -6,7 +6,7 @@
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'acquisitions-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Spent </div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Spent [% fund %]</div>
 
 <div id="doc3" class="yui-t2">
 
@@ -14,7 +14,7 @@
     <div id="yui-main">
         <div class="yui-b">
 
-<h1>Budgets &amp; Bookfunds</h1>
+<h1>Bookfund [% fund %]</h1>
 <h2>Spent</h2>
 
 
@@ -23,12 +23,13 @@
     <tr>
         <th> Title </th>
 	<th> Order </th>
-	<th> Supplier </th>
+	<th> Vendor </th>
 	<th> Invoice </th>
 	<th> Itemtype </th>
-	<th> Receieved </th>
+	<th> Received </th>
 	<th> Unit Price </th>
 	<th> Freight per Item </th>
+	<th> Date Ordered </th>
 	<th> Date Received </th>
 	<th> Subtotal </th>
     </tr>
@@ -48,7 +49,7 @@
             <a href="/cgi-bin/koha/acqui/orderreceive.pl?ordernumber=[% order.ordernumber %]&biblio=[% order.biblionumber %]&invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&catview=yes">[% order.ordernumber %]</a>
 	</td>
 	<td class="cell">
-	    [% order.booksellerid %]
+	    <a href="/cgi-bin/koha/acqui/supplier.pl?supplierid=[% order.booksellerid %]">[% order.booksellerid %]</a>
 	</td>
 	<td class="cell">
 	    <a href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% order.booksellerinvoicenumber %]&supplierid=[% order.booksellerid %]&datereceived=[% order.datereceived %]">[% order.booksellerinvoicenumber %]</a>
@@ -65,6 +66,9 @@
 	<td class="cell" align="right">
 	    [% order.freight %]
 	</td>
+	<td class="cell">
+	    [% order.entrydate %]
+	</td>
 	<td class="cell">
 	    [% order.datereceived %]
 	</td>
@@ -84,6 +88,7 @@
         <td> </td>
         <td> </td>
 	<td> </td>
+	<td> </td>
         <td align="right">
 		[% total %]
 	</td>
-- 
2.39.5