View | Details | Raw Unified | Return to bug 4502
Collapse All | Expand All

(-)a/admin/aqplan.pl (-5 / +1 lines)
Lines 106-115 if ( $budget_period_locked == 1 && not defined $show_actual ) { Link Here
106
106
107
$authcat = 'Asort1' if  not defined $authcat; # defaults to Asort if no authcat given
107
$authcat = 'Asort1' if  not defined $authcat; # defaults to Asort if no authcat given
108
108
109
# If no active budget is defined, budget_period_id is undef
110
# This is the behavior of GetBudgetPeriod
111
$authcat = '' unless $budget_period_id;
112
113
my $budget_id = $input->param('budget_id');
109
my $budget_id = $input->param('budget_id');
114
my $op        = $input->param("op");
110
my $op        = $input->param("op");
115
111
Lines 215-221 if ( $authcat =~ m/^Asort/ ) { Link Here
215
    $sth->finish;
211
    $sth->finish;
216
    @authvals = sort { $a <=> $b } @authvals;
212
    @authvals = sort { $a <=> $b } @authvals;
217
}
213
}
218
elsif ( $authcat eq 'MONTHS' ) {
214
elsif ( $authcat eq 'MONTHS' && $budget_period_startdate && $budget_period_enddate ) {
219
215
220
    # build months
216
    # build months
221
    my @start_date = UnixDate( $budget_period_startdate, ( '%Y', '%m', '%d' ) );
217
    my @start_date = UnixDate( $budget_period_startdate, ( '%Y', '%m', '%d' ) );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt (-2 / +3 lines)
Lines 226-232 Link Here
226
</form>
226
</form>
227
227
228
        [% ELSIF not budget_period_id %]
228
        [% ELSIF not budget_period_id %]
229
<div class="dialog alert">No active budget defined. You should define one before continuing.</div>
229
<div class="dialog alert">That budget is not defined. You should select a defined budget to continue.</div>
230
        [% ELSE %]
230
        [% ELSE %]
231
<div class="dialog message">No funds to display for this search criteria</div>
231
<div class="dialog message">No funds to display for this search criteria</div>
232
        [% END %]
232
        [% END %]
Lines 237-242 Link Here
237
<div class="yui-b">
237
<div class="yui-b">
238
238
239
<form method="post" action="/cgi-bin/koha/admin/aqplan.pl">
239
<form method="post" action="/cgi-bin/koha/admin/aqplan.pl">
240
    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
240
<fieldset class="brief">
241
<fieldset class="brief">
241
<h4>Filter</h4>
242
<h4>Filter</h4>
242
[% BLOCK planning_types %]
243
[% BLOCK planning_types %]
Lines 311-316 Link Here
311
        </li>
312
        </li>
312
    </ol>
313
    </ol>
313
    <fieldset class="action">    <input type="submit" value="Submit"/>
314
    <fieldset class="action">    <input type="submit" value="Submit"/>
315
    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
314
    <input type="hidden" name="report_name" value="[% report_name %]" />
316
    <input type="hidden" name="report_name" value="[% report_name %]" />
315
    <input type="hidden" name="output" value="file" /></fieldset>
317
    <input type="hidden" name="output" value="file" /></fieldset>
316
    </fieldset>
318
    </fieldset>
317
- 

Return to bug 4502