From 013f9292c7f16e35c5823dfe497aa6fcee511ab5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 7 Mar 2016 08:07:18 +0000 Subject: [PATCH] Bug 15987: Fix undefined subroutine &main::GetCurrency in acqui-home.pl Bug 15987 and bug 15049 were competing the push to master status at the same time. Bug 15987 removed the GetCurrency status and bug 15049 reintrocuced one occurrence of this subroutine. Test plan: Confirm that the test plan for 15049 still passes. --- acqui/acqui-home.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index 393a131..720f3ac 100755 --- a/acqui/acqui-home.pl +++ b/acqui/acqui-home.pl @@ -39,6 +39,8 @@ use C4::Branch; use C4::Debug; use C4::Suggestions; +use Koha::Acquisition::Currencies; + my $query = CGI->new; my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( { template_name => 'acqui/acqui-home.tt', @@ -129,11 +131,9 @@ $template->param( suggestions_count => $suggestions_count, ); -my $cur = GetCurrency(); -if ( $cur ) { - $template->param( - currency => $cur->{currency}, - ); +my $active_currency = Koha::Acquisition::Currencies->get_active; +if ( $active_currency ) { + $template->param( currency => $active_currency->currency, ); } output_html_with_http_headers $query, $cookie, $template->output; -- 2.7.0