From fa6b504e4cd6494e9caae8fb8141ce4f33f467cb Mon Sep 17 00:00:00 2001 From: Chris Cormack 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 (cherry picked from commit c64322e48de53ed64d65f8c86160848a492ea792) Signed-off-by: Chris Nighswonger --- 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 = <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' %] - +
@@ -14,7 +14,7 @@
-

Budgets & Bookfunds

+

Bookfund [% fund %]

Spent

@@ -23,12 +23,13 @@ Title Order - Supplier + Vendor Invoice Itemtype - Receieved + Received Unit Price Freight per Item + Date Ordered Date Received Subtotal @@ -48,7 +49,7 @@ [% order.ordernumber %] - [% order.booksellerid %] + [% order.booksellerid %] [% order.booksellerinvoicenumber %] @@ -65,6 +66,9 @@ [% order.freight %] + + [% order.entrydate %] + [% order.datereceived %] @@ -84,6 +88,7 @@ + [% total %] -- 2.39.5