@@ -, +, @@ --- admin/aqplan.pl | 6 +----- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 4 +++- 2 files changed, 4 insertions(+), 6 deletions(-) --- a/admin/aqplan.pl +++ a/admin/aqplan.pl @@ -106,10 +106,6 @@ if ( $budget_period_locked == 1 && not defined $show_actual ) { $authcat = 'Asort1' if not defined $authcat; # defaults to Asort if no authcat given -# If no active budget is defined, budget_period_id is undef -# This is the behavior of GetBudgetPeriod -$authcat = '' unless $budget_period_id; - my $budget_id = $input->param('budget_id'); my $op = $input->param("op"); @@ -215,7 +211,7 @@ if ( $authcat =~ m/^Asort/ ) { $sth->finish; @authvals = sort { $a <=> $b } @authvals; } -elsif ( $authcat eq 'MONTHS' ) { +elsif ( $authcat eq 'MONTHS' && $budget_period_startdate && $budget_period_enddate ) { # build months my @start_date = UnixDate( $budget_period_startdate, ( '%Y', '%m', '%d' ) ); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -226,7 +226,7 @@ [% ELSIF not budget_period_id %] -
No active budget defined. You should define one before continuing.
+
That budget is not defined. You should select a defined budget to continue.
[% ELSE %]
No funds to display for this search criteria
[% END %] @@ -237,6 +237,7 @@
+

Filter

[% BLOCK planning_types %] @@ -311,6 +312,7 @@
+
--