Bugzilla – Attachment 6958 Details for
Bug 929
See details of a budget
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 929: Follow up - showing fund code instead of internal number
Bug-929-Follow-up---showing-fund-code-instead-of-i.patch (text/plain), 6.92 KB, created by
Chris Cormack
on 2011-12-29 19:11:47 UTC
(
hide
)
Description:
Bug 929: Follow up - showing fund code instead of internal number
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-12-29 19:11:47 UTC
Size:
6.92 KB
patch
obsolete
>From 549634b3de45efa66ba3987f1d2967cc5ac76ca9 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >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 <chrisc@catalyst.net.nz> >--- > 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() { > <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 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' %] > >-<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> >@@ -54,9 +54,9 @@ > [% order.left %] > </td> > <td class="cell" align="right"> >- [% order.ecost %] >+ [% 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 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' %] > >-<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> > > >@@ -65,13 +65,13 @@ > [% order.unitprice %] > </td> > <td class="cell" align="right"> >- [% order.freight %] >+ [% order.freight %] > </td> >- <td class="cell"> >+ <td class="cell" align="right"> > [% order.entrydate | $KohaDates %] > </td> >- <td class="cell"> >- [% order.datereceived | $KohaDates %] >+ <td class="cell" align="right"> >+ [% order.datereceived | $KohaDates %] > </td> > <td class="cell" align="right"> > [% order.subtotal %] >-- >1.7.5.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 929
:
6936
|
6941
|
6947
|
6948
|
6949
|
6950
|
6951
|
6952
|
6953
|
6958
|
7109
|
7110
|
7142
|
7143
|
7393