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

(-)a/acqui/addorderiso2709.pl (+5 lines)
Lines 305-313 foreach my $r ( @{$budgets_hierarchy} ) { Link Here
305
        b_txt => $r->{budget_name},
305
        b_txt => $r->{budget_name},
306
        b_sort1_authcat => $r->{'sort1_authcat'},
306
        b_sort1_authcat => $r->{'sort1_authcat'},
307
        b_sort2_authcat => $r->{'sort2_authcat'},
307
        b_sort2_authcat => $r->{'sort2_authcat'},
308
        b_active => $r->{budget_period_active},
308
        b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
309
        b_sel => ( $r->{budget_id} == $budget_id ) ? 1 : 0,
309
      };
310
      };
310
}
311
}
312
313
@{$budget_loop} =
314
  sort { uc( $a->{b_txt}) cmp uc( $b->{b_txt}) } @{$budget_loop};
315
311
$template->param( budget_loop    => $budget_loop,);
316
$template->param( budget_loop    => $budget_loop,);
312
317
313
my $CGIsort1;
318
my $CGIsort1;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-7 / +34 lines)
Lines 27-32 Link Here
27
            "sPaginationType": "four_button"
27
            "sPaginationType": "four_button"
28
        } ) );
28
        } ) );
29
29
30
        //keep a copy of all budgets before removing the inactives
31
        disabledBudgetsCopy = $("select[name='all_budget_id']").html();
32
        $("select[name='all_budget_id'] .b_inactive").remove();
33
        $("select[name='budget_id'] .b_inactive").remove();
34
35
        $("#showallbudgets").click(function() {
36
            if ($(this).is(":checked")) {
37
                $("select[name='budget_id']").html(disabledBudgetsCopy); //Puts back all the funds
38
            }
39
            else {
40
                $("select[name='budget_id'] .b_inactive").remove();
41
            }
42
        });
43
44
        $("#all_showallbudgets").click(function() {
45
            if ($(this).is(":checked")) {
46
                $("select[name='all_budget_id']").html(disabledBudgetsCopy); //Puts back all the funds
47
            }
48
            else {
49
                $("select[name='all_budget_id'] .b_inactive").remove();
50
            }
51
        });
52
30
        $("select[name='budget_id']").change(function(){
53
        $("select[name='budget_id']").change(function(){
31
            var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
54
            var sort1_authcat = $(this).find("option:selected").attr('data-sort1-authcat');
32
            var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
55
            var sort2_authcat = $(this).find("option:selected").attr('data-sort2-authcat');
Lines 149-154 Link Here
149
                  <div id="records_to_import">
172
                  <div id="records_to_import">
150
                    <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
173
                    <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
151
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
174
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
175
                    <label for="showallbudgets" style="float:none;width:auto;">&nbsp;Show all funds:</label>
176
                    <input type="checkbox" id="showallbudgets" />
152
                        <input type="hidden" name="op" value="import_records"/>
177
                        <input type="hidden" name="op" value="import_records"/>
153
                        <input type="hidden" name="basketno" value="[% basketno %]" />
178
                        <input type="hidden" name="basketno" value="[% basketno %]" />
154
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
179
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
Lines 201-212 Link Here
201
                                  <input type="hidden" size="20" name="budget_id" value="[% budget_id %]" />[% Budget_name %]
226
                                  <input type="hidden" size="20" name="budget_id" value="[% budget_id %]" />[% Budget_name %]
202
                                [% ELSE %]
227
                                [% ELSE %]
203
                                  <select id="fund_record_[% biblio.import_record_id %]" size="1" name="budget_id">
228
                                  <select id="fund_record_[% biblio.import_record_id %]" size="1" name="budget_id">
204
                                    <option value=""></option>
229
                                    <option value="">Select a fund</option>
205
                                    [% FOREACH budget IN budget_loop %]
230
                                    [% FOREACH budget IN budget_loop %]
206
                                        [% IF ( budget.b_id == biblio.budget_id ) %]
231
                                        [% IF ( budget.b_id == biblio.budget_id ) %]
207
                                            <option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]" selected="selected">[% budget.b_txt %]</option>
232
                                            <option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]" selected="selected">[% budget.b_txt %]</option>
208
                                        [% ELSE %]
233
                                        [% ELSE %]
209
                                            <option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option>
234
                                            [% IF budget.b_active %]<option value="[% budget.b_id %]" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option>
235
                                            [% ELSE %]<option value="[% budget.b_id %]" class="b_inactive" data-sort1-authcat="[% budget.b_sort1_authcat %]" data-sort2-authcat="[% budget.b_sort2_authcat %]">[% budget.b_txt %]</option>
236
                                            [% END %]
210
                                        [% END %]
237
                                        [% END %]
211
                                    [% END %]
238
                                    [% END %]
212
                                  </select>
239
                                  </select>
Lines 284-297 Link Here
284
                                        <li>
311
                                        <li>
285
                                            <label for="all_budget_id">Fund: </label>
312
                                            <label for="all_budget_id">Fund: </label>
286
                                            <select id="all_budget_id" size="1" name="all_budget_id">
313
                                            <select id="all_budget_id" size="1" name="all_budget_id">
314
                                              <option value="">Select a fund</option>
287
                                            [% FOREACH budget_loo IN budget_loop %]
315
                                            [% FOREACH budget_loo IN budget_loop %]
288
                                                [% IF ( budget_loo.b_sel ) %]
316
                                                [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
289
                                                    <option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]" selected="selected">[% budget_loo.b_txt %]</option>
317
                                                [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
290
                                                [% ELSE %]
291
                                                    <option value="[% budget_loo.b_id %]" data-sort1-authcat="[% budget_loo.b_sort1_authcat %]" data-sort2-authcat="[% budget_loo.b_sort2_authcat %]">[% budget_loo.b_txt %]</option>
292
                                                [% END %]
318
                                                [% END %]
293
                                            [% END %]
319
                                            [% END %]
294
                                            </select>
320
                                            </select>
321
                                            <label for="all_showallbudgets" style="float:none;width:auto;">&nbsp;Show all:</label>
322
                                            <input type="checkbox" id="all_showallbudgets" />
295
                                        </li>
323
                                        </li>
296
                                    [% END %]
324
                                    [% END %]
297
                                </li>
325
                                </li>
298
- 

Return to bug 10875