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

(-)a/acqui/neworderempty.pl (-4 / +8 lines)
Lines 335-345 my $patron = Koha::Patrons->find( $loggedinuser )->unblessed; Link Here
335
335
336
my $budget =  GetBudget($budget_id);
336
my $budget =  GetBudget($budget_id);
337
# build budget list
337
# build budget list
338
my $budget_loop = [];
338
my %budget_loops;
339
my $budgets = GetBudgetHierarchy;
339
my $budgets = GetBudgetHierarchy;
340
foreach my $r (@{$budgets}) {
340
foreach my $r (@{$budgets}) {
341
    next unless (CanUserUseBudget($patron, $r, $userflags));
341
    next unless (CanUserUseBudget($patron, $r, $userflags));
342
    push @{$budget_loop}, {
342
    unless ( defined $budget_loops{$r->{budget_period_id}} ){
343
        $budget_loops{$r->{budget_period_id}}->{description} = $r->{budget_period_description};
344
        $budget_loops{$r->{budget_period_id}}->{active} = $r->{budget_period_active};
345
        $budget_loops{$r->{budget_period_id}}->{funds} = [];
346
    }
347
    push @{$budget_loops{$r->{budget_period_id}}->{funds}}, {
343
        b_id  => $r->{budget_id},
348
        b_id  => $r->{budget_id},
344
        b_txt => $r->{budget_name},
349
        b_txt => $r->{budget_name},
345
        b_sort1_authcat => $r->{'sort1_authcat'},
350
        b_sort1_authcat => $r->{'sort1_authcat'},
Lines 350-356 foreach my $r (@{$budgets}) { Link Here
350
    };
355
    };
351
}
356
}
352
357
353
354
$template->param( sort1 => $data->{'sort1'} );
358
$template->param( sort1 => $data->{'sort1'} );
355
$template->param( sort2 => $data->{'sort2'} );
359
$template->param( sort2 => $data->{'sort2'} );
356
360
Lines 487-493 $template->param( Link Here
487
    author               => $data->{'author'},
491
    author               => $data->{'author'},
488
    publicationyear      => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'},
492
    publicationyear      => $data->{'publicationyear'} ? $data->{'publicationyear'} : $data->{'copyrightdate'},
489
    editionstatement     => $data->{'editionstatement'},
493
    editionstatement     => $data->{'editionstatement'},
490
    budget_loop          => $budget_loop,
494
    budget_loop          => \%budget_loops,
491
    isbn                 => $data->{'isbn'},
495
    isbn                 => $data->{'isbn'},
492
    ean                  => $data->{'ean'},
496
    ean                  => $data->{'ean'},
493
    seriestitle          => $data->{'seriestitle'},
497
    seriestitle          => $data->{'seriestitle'},
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets_loop.inc (+28 lines)
Line 0 Link Here
1
[% FOREACH budget_period_id IN budget_loop.keys %]
2
    [% SET budget_period = budget_loop.$budget_period_id %]
3
    [% IF budget_period.active %]
4
        <optgroup label="[% budget_period.description | html %]">
5
    [% ELSE %]
6
        <optgroup class="inactive_budget" label="[% budget_period.description | html %] (Inactive)">
7
    [% END %]
8
    [% FOREACH budget_loo IN budget_period.funds %]
9
        [% level_indent_cnt = 0 %]
10
        [% level_indent = "" %]
11
        [% WHILE level_indent_cnt < budget_loo.b_level %]
12
            [% level_indent = level_indent _ " -- " %]
13
            [% level_indent_cnt = level_indent_cnt +1 %]
14
        [% END %]
15
        [% IF ( budget_loo.b_sel ) %]
16
            [% active_count = 0 #select no other fund %]
17
                <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
18
            [% ELSIF active_count==1 && budget_loo.b_active %]
19
                <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
20
            [% ELSE %]
21
                [% bdgclass=budget_loo.b_active? "": inactive_class | html %]
22
                <option value="[% budget_loo.b_id | html %]" class="[% bdgclass | html %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
23
            [% END %]
24
            [% level_indent | html %][% budget_loo.b_txt | html %][% IF !budget_loo.b_active %] (inactive)[% END %]
25
            </option>
26
        [% END %]
27
    </optgroup>
28
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-30 / +1 lines)
Lines 592-628 Link Here
592
            </li>
592
            </li>
593
            <li>
593
            <li>
594
                <label class="required" for="budget_id">Fund: </label>
594
                <label class="required" for="budget_id">Fund: </label>
595
                [% active_count = 0 %]
596
                [% IF !ordernumber %]
597
                    [% FOREACH budget_loo IN budget_loop %]
598
                        [% active_count= active_count + budget_loo.b_active %]
599
                    [% END %]
600
                [% END %]
601
                <select class="select2" id="budget_id" name="budget_id">
595
                <select class="select2" id="budget_id" name="budget_id">
602
                    <option value="">Select a fund</option>
596
                    [% INCLUDE 'budgets_loop.inc' inactive_class = "b_inactive" %]
603
                [% FOREACH budget_loo IN budget_loop %]
604
                   [% level_indent_cnt = 0 %]
605
                    [% level_indent = "" %]
606
                    [% WHILE level_indent_cnt < budget_loo.b_level %]
607
                        [% level_indent = level_indent _ " -- " %]
608
                        [% level_indent_cnt = level_indent_cnt +1 %]
609
                    [% END %]
610
611
                    [% IF ( budget_loo.b_sel ) %]
612
                        [% active_count = 0 #select no other fund %]
613
                        <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]"
614
                        >
615
                    [% ELSIF active_count==1 && budget_loo.b_active %]
616
                        <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]"
617
                        >
618
                    [% ELSE %]
619
                        [% bdgclass=budget_loo.b_active? "": "b_inactive" | html %]
620
                        <option value="[% budget_loo.b_id | html %]" class="[% bdgclass | html %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]"
621
                        >
622
                    [% END %]
623
                        [% level_indent | html %][% budget_loo.b_txt | html %][% IF !budget_loo.b_active %] (inactive)[% END %]
624
                    </option>
625
                [% END %]
626
                </select>
597
                </select>
627
                <span class="required">Required</span>
598
                <span class="required">Required</span>
628
                <label for="showallbudgets" style="float:none;">&nbsp;Show inactive:</label>
599
                <label for="showallbudgets" style="float:none;">&nbsp;Show inactive:</label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt (-30 / +1 lines)
Lines 291-325 Link Here
291
                                                <optgroup label="Current">
291
                                                <optgroup label="Current">
292
                                                    <option id="selected_bookfund" selected="selected"></option>
292
                                                    <option id="selected_bookfund" selected="selected"></option>
293
                                                </optgroup>
293
                                                </optgroup>
294
                                            [% FOREACH budget_period_id IN budget_loops.keys %]
294
                                                [% INCLUDE 'budgets_loop.inc' inactive_class = "inactive_budget" %]
295
                                                [% SET budget_period = budget_loops.$budget_period_id %]
296
                                                [% IF budget_period.active %]
297
                                                    <optgroup label="[% budget_period.description | html %]">
298
                                                [% ELSE %]
299
                                                    <optgroup class="inactive_budget" label="[% budget_period.description | html %] (Inactive)">
300
                                                [% END %]
301
                                                [% FOREACH budget_loo IN budget_period.funds %]
302
                                                [% level_indent_cnt = 0 %]
303
                                                    [% level_indent = "" %]
304
                                                    [% WHILE level_indent_cnt < budget_loo.b_level %]
305
                                                        [% level_indent = level_indent _ " -- " %]
306
                                                        [% level_indent_cnt = level_indent_cnt +1 %]
307
                                                    [% END %]
308
309
                                                    [% IF ( budget_loo.b_sel ) %]
310
                                                        [% active_count = 0 #select no other fund %]
311
                                                        <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
312
                                                    [% ELSIF active_count==1 && budget_loo.b_active %]
313
                                                        <option value="[% budget_loo.b_id | html %]" selected="selected" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
314
                                                    [% ELSE %]
315
                                                        [% bdgclass=budget_loo.b_active? "": "inactive_budget" | html %]
316
                                                        <option value="[% budget_loo.b_id | html %]" class="[% bdgclass | html %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat | html %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat | html %]">
317
                                                    [% END %]
318
                                                        [% level_indent | html %][% budget_loo.b_txt | html %][% IF !budget_loo.b_active %] (inactive)[% END %]
319
                                                    </option>
320
                                                [% END %]
321
                                                </optgroup>
322
                                            [% END %]
323
                                            </select>
295
                                            </select>
324
                                            <span class="required">Required</span>
296
                                            <span class="required">Required</span>
325
                                        </li>
297
                                        </li>
326
- 

Return to bug 31606