Bugzilla – Attachment 42368 Details for
Bug 14649
fund names not displayed in budget planning
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 14649: Fix regression - display fund name on budget planning
PASSED-QA-Bug-14649-Fix-regression---display-fund-.patch (text/plain), 2.83 KB, created by
Katrin Fischer
on 2015-09-03 22:34:10 UTC
(
hide
)
Description:
[PASSED QA] Bug 14649: Fix regression - display fund name on budget planning
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2015-09-03 22:34:10 UTC
Size:
2.83 KB
patch
obsolete
>From 9c5cd582fb6748b0aae6f92e37334c5691b57bbc Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Thu, 6 Aug 2015 07:19:06 +0100 >Subject: [PATCH] [PASSED QA] Bug 14649: Fix regression - display fund name on > budget planning > >A patch from bug 11714 removes 'budget_name_indent', which was useless. >The script and the template should use the budget_name value. > >Note that this patch impacts the CSV export, which does not work, so it cannot be >tested. > >Test plan: >Edit a fund and click on one of the Planning value (by months, etc.) >The "Fund name" column should be correctly populated with the fund >names. > >Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> > >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > admin/aqplan.pl | 5 ++--- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +- > 2 files changed, 3 insertions(+), 4 deletions(-) > >diff --git a/admin/aqplan.pl b/admin/aqplan.pl >index 2c46cbe..082faeb 100755 >--- a/admin/aqplan.pl >+++ b/admin/aqplan.pl >@@ -372,7 +372,7 @@ foreach my $budget (@budgets) { > > %budget_line = ( > lines => \@cells_line, >- budget_name_indent => $budget->{budget_name_indent}, >+ budget_name => $budget->{budget_name}, > budget_amount => $budget->{budget_amount}, > budget_alloc => $budget->{budget_alloc}, > budget_act_remain => sprintf( "%.2f", $budget_act_remain ), >@@ -448,8 +448,7 @@ sub _print_to_csv { > print "$str\n"; > > foreach my $row (@$results) { >- $row->{'budget_name_indent'} =~ s/ / /g; >- my @col = ( $row->{'budget_name_indent'}, $row->{'budget_amount'} ); >+ my @col = ( $row->{'budget_name'}, $row->{'budget_amount'} ); > my $l = $row->{'lines'}; > foreach my $line (@$l) { > push @col, $line->{'estimated_amount'}; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >index abfe5de..89c7456 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -132,7 +132,7 @@ > [% ELSE %] > <td> > [% END %] >- <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget_line.budget_id %]&budget_period_id=[% budget_line.budget_period_id %]">[% budget_line.budget_name_indent %]</a></td> >+ <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget_line.budget_id %]&budget_period_id=[% budget_line.budget_period_id %]">[% budget_line.budget_name %]</a></td> > <td><span id="[% budget_line.budget_amount %]">[% budget_line.budget_amount | $Price %] </span> > > >-- >1.9.1
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 14649
:
41396
|
41397
|
41398
|
41703
|
42268
|
42269
|
42367
| 42368 |
42369