From 5c1621bf8355b130f0aafa268e4182c1132f6bd5 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 Signed-off-by: Paul Poulain (cherry picked from commit 71d2d81e346846f455e2f673d8983ffd9d00310e) Signed-off-by: Chris Nighswonger --- acqui/ordered.pl | 4 ++-- acqui/spent.pl | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/acqui/ordered.pl b/acqui/ordered.pl index b681afbf4c..f38264f313 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 a50b7aef44..12260c044e 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 09ec87428e..03cdc2d8b8 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 018d80725a..93540c930b 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

@@ -56,7 +56,7 @@ - - -
[% 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 49bcedb0cc..c6825c82fc 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

@@ -67,10 +67,10 @@
[% order.freight %] + [% order.entrydate | $KohaDates %] + [% order.datereceived | $KohaDates %] -- 2.39.5