From d088816f8a833358557454e84bdbf04a0b7f3232 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Wed, 14 Feb 2018 20:19:01 +0000 Subject: [PATCH] Bug 20201: Silence warnings triggered by admin/aqplan.pl TEST PLAN --------- 0) back up DB 1) Run the following commands on a kohadevbox: reset_all git bz apply 20185 echo | sudo tee /var/log/koha/kohadev/plack-error.log restart_all 2) Navigate in a staff client: Home -> Administration -> Budgets -> Edit -> Planning by libraries -- could be any of the planning, but by libraries is nicely visible on screen. 3) Run the following commands: cat /var/log/koha/kohadev/plack-error.log -- several warnings. 4) Run the following commands: git bz apply 20201 echo | sudo tee /var/log/koha/kohadev/plack-error.log restart_all 5) repeat step 2 and refresh the staff client page. -- this time warnings related to aqplan.pl are not there. 6) run koha qa test tools Signed-off-by: Jonathan Druart Conflicts: admin/aqplan.pl Signed-off-by: Nick Clemens --- admin/aqplan.pl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/admin/aqplan.pl b/admin/aqplan.pl index f96086e013..6c65bb9ade 100755 --- a/admin/aqplan.pl +++ b/admin/aqplan.pl @@ -89,12 +89,12 @@ my $borrower_id = $template->{VARS}->{'USER_INFO'}->{'borrowernumber'}; my $borrower_branchcode = $template->{VARS}->{'USER_INFO'}->{'branchcode'}; my $authcat = $input->param('authcat'); -my $show_active = $input->param('show_active'); +my $show_active = $input->param('show_active') // 0; my $show_actual = $input->param('show_actual'); my $show_percent = $input->param('show_percent'); -my $output = $input->param("output"); -my $basename = $input->param("basename"); -my $del = $input->param("sep"); +my $output = $input->param("output") // q{}; +our $basename = $input->param("basename"); +our $del = $input->param("sep"); my $show_mine = $input->param('show_mine') ; @@ -107,7 +107,7 @@ if ( $budget_period_locked == 1 && not defined $show_actual ) { $authcat = 'Asort1' if not defined $authcat; # defaults to Asort if no authcat given my $budget_id = $input->param('budget_id'); -my $op = $input->param("op"); +my $op = $input->param("op") // q{}; my $budgets_ref = GetBudgetHierarchy( $budget_period_id, $show_mine?$template->{VARS}->{'USER_INFO'}->{'branchcode'}:'', $show_mine?$template->{VARS}->{'USER_INFO'}->{'borrowernumber'}:'' ); @@ -351,8 +351,8 @@ foreach my $budget (@budgets) { ); my ( $actual, $estimated, $display ) = GetBudgetsPlanCell( \%cell, $period, $budget ); - $cell{actual_amount} = sprintf( "%.2f", $actual ); - $cell{estimated_amount} = sprintf( "%.2f", $estimated ); + $cell{actual_amount} = sprintf( "%.2f", $actual // 0 ); + $cell{estimated_amount} = sprintf( "%.2f", $estimated // 0 ); $cell{display} = $authvals_row[$i]{display}; $cell{colnum} = $i; -- 2.39.5