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

(-)a/admin/aqplan.pl (-5 / +1 lines)
Lines 104-113 if ( $budget_period_locked == 1 && not defined $show_actual ) { Link Here
104
104
105
$authcat = 'Asort1' if  not defined $authcat; # defaults to Asort if no authcat given
105
$authcat = 'Asort1' if  not defined $authcat; # defaults to Asort if no authcat given
106
106
107
# If no active budget is defined, budget_period_id is undef
108
# This is the behavior of GetBudgetPeriod
109
$authcat = '' unless $budget_period_id;
110
111
my $budget_id = $input->param('budget_id');
107
my $budget_id = $input->param('budget_id');
112
my $op        = $input->param("op");
108
my $op        = $input->param("op");
113
109
Lines 213-219 if ( $authcat =~ m/^Asort/ ) { Link Here
213
    $sth->finish;
209
    $sth->finish;
214
    @authvals = sort { $a <=> $b } @authvals;
210
    @authvals = sort { $a <=> $b } @authvals;
215
}
211
}
216
elsif ( $authcat eq 'MONTHS' ) {
212
elsif ( $authcat eq 'MONTHS' && $budget_period_startdate && $budget_period_enddate ) {
217
213
218
    # build months
214
    # build months
219
    my @start_date = UnixDate( $budget_period_startdate, ( '%Y', '%m', '%d' ) );
215
    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 313-318 Link Here
313
        </li>
314
        </li>
314
    </ol>
315
    </ol>
315
    <fieldset class="action">    <input type="submit" value="Submit"/>
316
    <fieldset class="action">    <input type="submit" value="Submit"/>
317
    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
316
    <input type="hidden" name="report_name" value="[% report_name %]" />
318
    <input type="hidden" name="report_name" value="[% report_name %]" />
317
    <input type="hidden" name="output" value="file" /></fieldset>
319
    <input type="hidden" name="output" value="file" /></fieldset>
318
    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
320
    <input type="hidden" name="budget_period_id" value="[% budget_period_id %]" />
319
- 

Return to bug 4502