From e0ed9cbcf60a74dbe2690e6c34c5a311744f49ae 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] 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>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 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 2c46cbed5b..082faeb4ff 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/&nbsp;/ /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 abfe5de6bc..89c7456474 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&amp;budget_id=[% budget_line.budget_id %]&amp;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&amp;budget_id=[% budget_line.budget_id %]&amp;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 %]&nbsp;</span>
 
 
-- 
2.39.5