From 549634b3de45efa66ba3987f1d2967cc5ac76ca9 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Thu, 29 Dec 2011 10:51:15 +0100 Subject: [PATCH] Bug 929: Follow up - showing fund code instead of internal number Signed-off-by: Chris Cormack --- acqui/ordered.pl | 4 ++-- acqui/spent.pl | 4 ++-- .../prog/en/modules/acqui/acqui-home.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 10 +++++----- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/acqui/ordered.pl b/acqui/ordered.pl index c3c4c4e..5410f78 100755 --- a/acqui/ordered.pl +++ b/acqui/ordered.pl @@ -38,8 +38,7 @@ use C4::Dates; my $dbh = C4::Context->dbh; my $input = new CGI; my $fund_id = $input->param('fund'); -my $start = $input->param('start'); -my $end = $input->param('end'); +my $fund_code = $input->param('fund_code'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -103,6 +102,7 @@ $total = sprintf( "%.2f", $total ); $template->{VARS}->{'fund'} = $fund_id; $template->{VARS}->{'ordered'} = \@ordered; $template->{VARS}->{'total'} = $total; +$template->{VARS}->{'fund_code'} = $fund_code; $sth->finish; diff --git a/acqui/spent.pl b/acqui/spent.pl index c2f5299..929cf29 100755 --- a/acqui/spent.pl +++ b/acqui/spent.pl @@ -40,8 +40,7 @@ use CGI; my $dbh = C4::Context->dbh; my $input = new CGI; my $bookfund = $input->param('fund'); -my $start = $input->param('start'); -my $end = $input->param('end'); +my $fund_code = $input->param('fund_code'); my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -107,6 +106,7 @@ $total = sprintf( "%.2f", $total ); $template->{VARS}->{'fund'} = $bookfund; $template->{VARS}->{'spent'} = \@spent; $template->{VARS}->{'total'} = $total; +$template->{VARS}->{'fund_code'} = $fund_code; $sth->finish; output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 09ec874..03cdc2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -122,8 +122,8 @@ $(document).ready(function() { [% loop_budge.budget_owner %] [% loop_budge.budget_branchname %] [% loop_budge.budget_amount %] - [% loop_budge.budget_ordered %] - [% loop_budge.budget_spent %] + [% loop_budge.budget_ordered %] + [% loop_budge.budget_spent %] [% loop_budge.budget_avail %] [% ELSE %] @@ -136,8 +136,8 @@ $(document).ready(function() { [% loop_budge.budget_owner %] [% loop_budge.budget_branchname %] [% loop_budge.budget_amount %] - [% loop_budge.budget_ordered %] - [% loop_budge.budget_spent %] + [% loop_budge.budget_ordered %] + [% loop_budge.budget_spent %] [% loop_budge.budget_avail %] [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index a95eeae..0488fb3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -7,7 +7,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
@@ -15,8 +15,8 @@
-

Bookfunds

-

Ordered - [% fund %]

+

Fund: [% fund_code %]

+

Ordered

@@ -54,9 +54,9 @@ [% order.left %] - - -
- [% order.ecost %] + [% order.ecost %] + [% order.entrydate | $KohaDates %] 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 1c41cc7..b8ef754 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -7,7 +7,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
@@ -15,7 +15,7 @@
-

Bookfund [% fund %]

+

Fund: [% fund_code %]

Spent

@@ -65,13 +65,13 @@ [% order.unitprice %]
- [% order.freight %] + [% order.freight %] + [% order.entrydate | $KohaDates %] - [% order.datereceived | $KohaDates %] + + [% order.datereceived | $KohaDates %] [% order.subtotal %] -- 1.7.5.4