[Patches] [PATCH] Bug 929: Follow up - showing fund code instead of internal
koha-patchbot at kohaaloha.com
koha-patchbot at kohaaloha.com
Thu Dec 29 23:05:07 NZDT 2011
From: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu, 29 Dec 2011 10:51:15 +0100
Subject: [PATCH] Bug 929: Follow up - showing fund code instead of internal
number
---
acqui/ordered.pl | 4 ++--
acqui/spent.pl | 4 ++--
.../prog/en/modules/acqui/acqui-home.tt | 8 ++++----
.../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 8 ++++----
.../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 b681afb..f38264f 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 a50b7ae..12260c0 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() {
<td align="center">[% loop_budge.budget_owner %]</td>
<td align="center">[% loop_budge.budget_branchname %]</td>
<td align="right" >[% loop_budge.budget_amount %]</td>
- <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
- <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
+ <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
+ <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
<td align="right" >[% loop_budge.budget_avail %]</td>
</tr>
[% ELSE %]
@@ -136,8 +136,8 @@ $(document).ready(function() {
<td align="center">[% loop_budge.budget_owner %]</td>
<td align="center">[% loop_budge.budget_branchname %]</td>
<td align="right" >[% loop_budge.budget_amount %]</td>
- <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_ordered %]</a></td>
- <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]">[% loop_budge.budget_spent %]</a></td>
+ <td align="right" ><a href="ordered.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_ordered %]</a></td>
+ <td align="right" ><a href="spent.pl?fund=[% loop_budge.budget_id %]&fund_code=[% loop_budge.budget_code %]">[% loop_budge.budget_spent %]</a></td>
<td align="right" >[% loop_budge.budget_avail %]</td>
[% 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 018d807..93540c9 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' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Ordered - [% fund %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Ordered - [% fund_code %]</div>
<div id="doc3" class="yui-t2">
@@ -15,8 +15,8 @@
<div id="yui-main">
<div class="yui-b">
-<h1>Bookfunds</h1>
-<h2>Ordered - [% fund %]</h2>
+<h1>Fund: [% fund_code %]</h1>
+<h2>Ordered</h2>
<table cellspacing="0" cellpadding="0" border="0" id="spent" class="collapse">
<thead>
@@ -56,7 +56,7 @@
<td class="cell" align="right">
[% order.ecost %]
</td>
- <td class="cell">
+ <td class="cell" align="right">
[% order.entrydate | $KohaDates %]
</td>
<td class="cell" align="right">
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 49bcedb..c6825c8 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' %]
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Spent [% fund %]</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> › Spent - [% fund_code %]</div>
<div id="doc3" class="yui-t2">
@@ -15,7 +15,7 @@
<div id="yui-main">
<div class="yui-b">
-<h1>Bookfund [% fund %]</h1>
+<h1>Fund: [% fund_code %]</h1>
<h2>Spent</h2>
@@ -67,10 +67,10 @@
<td class="cell" align="right">
[% order.freight %]
</td>
- <td class="cell">
+ <td class="cell" align="right">
[% order.entrydate | $KohaDates %]
</td>
- <td class="cell">
+ <td class="cell" align="right">
[% order.datereceived | $KohaDates %]
</td>
<td class="cell" align="right">
--
1.7.5.4
More information about the Patches
mailing list