From 6894911d1de83ba26ae57eb636b03bfd4d0b8480 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 13 Jun 2017 05:06:39 +0000 Subject: [PATCH] [SIGNED-OFF] Bug 18351: [FOLLOW-UP] Some code fixes See Comment 5. Ready to test. Signed-off-by: Lee Jamison Signed-off-by: Owen Leonard --- admin/aqbudgetperiods.pl | 4 ++-- .../prog/en/modules/admin/.aqbudgetperiods.tt.swp | Bin 0 -> 40960 bytes 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/.aqbudgetperiods.tt.swp diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl index d953658..a7c1916 100755 --- a/admin/aqbudgetperiods.pl +++ b/admin/aqbudgetperiods.pl @@ -263,7 +263,7 @@ my @period_active_loop; foreach my $result ( @{$results} ) { my $budgetperiod = $result; $budgetperiod->{budget_active} = 1; - my @funds = Koha::Database->new()->schema->resultset('Aqbudget')->search({ budget_period_id => $budgetperiod->{budget_period_id} }); + my @funds = GetBudgets({ budget_period_id => $budgetperiod->{budget_period_id} }); $budgetperiod->{count} = scalar @funds; push( @period_active_loop, $budgetperiod ); } @@ -278,7 +278,7 @@ my @period_inactive_loop; foreach my $result ( @{$results} ) { my $budgetperiod = $result; $budgetperiod->{budget_active} = 1; - my @funds = Koha::Database->new()->schema->resultset('Aqbudget')->search({ budget_period_id => $budgetperiod->{budget_period_id} }); + my @funds = GetBudgets({ budget_period_id => $budgetperiod->{budget_period_id} }); $budgetperiod->{count} = scalar @funds; push( @period_inactive_loop, $budgetperiod ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/.aqbudgetperiods.tt.swp b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/.aqbudgetperiods.tt.swp new file mode 100644 index 0000000000000000000000000000000000000000..12b7b4b67182a6831933deef3c70f3fd5be03831 GIT binary patch literal 40960 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