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

(-)a/acqui/addorderiso2709.pl (+1 lines)
Lines 502-507 sub get_infos_syspref { Link Here
502
    }
502
    }
503
    my $r;
503
    my $r;
504
    for my $field_name ( @$field_list ) {
504
    for my $field_name ( @$field_list ) {
505
        next unless exists $yaml->{$field_name};
505
        my @fields = split /\|/, $yaml->{$field_name};
506
        my @fields = split /\|/, $yaml->{$field_name};
506
        for my $field ( @fields ) {
507
        for my $field ( @fields ) {
507
            my ( $f, $sf ) = split /\$/, $field;
508
            my ( $f, $sf ) = split /\$/, $field;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-17 / +25 lines)
Lines 72-82 Link Here
72
            if ( $(this).is(':checked') ) {
72
            if ( $(this).is(':checked') ) {
73
                $(container).addClass("selected");
73
                $(container).addClass("selected");
74
                $(container).removeClass("unselected");
74
                $(container).removeClass("unselected");
75
                $(container).find("ol").toggle();
75
                $(container).find("ol").toggle(true);
76
            } else {
76
            } else {
77
                $(container).addClass("unselected");
77
                $(container).addClass("unselected");
78
                $(container).removeClass("selected");
78
                $(container).removeClass("selected");
79
                $(container).find("ol").toggle();
79
                $(container).find("ol").toggle(false);
80
            }
80
            }
81
        } );
81
        } );
82
82
Lines 114-125 Link Here
114
114
115
            return disableUnchecked($(this));
115
            return disableUnchecked($(this));
116
        });
116
        });
117
        $('#tabs').tabs();
117
    });
118
    });
118
119
119
    function disableUnchecked(form){
120
    function disableUnchecked(form){
120
        $("div.biblio.unselected").each(function(){
121
        $("div.biblio.unselected").each(function(){
121
            $(this).find('select').attr('disabled', 'disabled');
122
            $(this).remove();
122
            $(this).find('input').attr('disabled', 'disabled');
123
        });
123
        });
124
        return 1;
124
        return 1;
125
    }
125
    }
Lines 138-148 Link Here
138
                <h1>Add orders from [% comments %]
138
                <h1>Add orders from [% comments %]
139
                    ([% file_name %] staged on [% upload_timestamp %])
139
                    ([% file_name %] staged on [% upload_timestamp %])
140
                </h1>
140
                </h1>
141
                <div>
141
                <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
142
                <div id="tabs" class="toptabs">
143
                  <ul>
144
                    <li><a href="#records_to_import">Select to import</a></li>
145
                    <li><a href="#items_info" class="items_info">Items information</a></li>
146
                    <li><a href="#accounting_details">Default accounting details</a></li>
147
                  </ul>
148
142
                  <div id="records_to_import">
149
                  <div id="records_to_import">
143
                    <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
150
                    <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
144
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
151
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
145
                    <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
146
                        <input type="hidden" name="op" value="import_records"/>
152
                        <input type="hidden" name="op" value="import_records"/>
147
                        <input type="hidden" name="basketno" value="[% basketno %]" />
153
                        <input type="hidden" name="basketno" value="[% basketno %]" />
148
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
154
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
Lines 154-160 Link Here
154
                        [% END %]
160
                        [% END %]
155
161
156
                        [% FOREACH biblio IN biblio_list %]
162
                        [% FOREACH biblio IN biblio_list %]
157
                        <fieldset class="biblio unselected rows">
163
                        <fieldset class="biblio unselected rows" style="float:none;">
158
                          <legend>
164
                          <legend>
159
                            <label for="record_[% biblio.import_record_id %]" style="width:auto;">
165
                            <label for="record_[% biblio.import_record_id %]" style="width:auto;">
160
                              <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
166
                              <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
Lines 218-229 Link Here
218
                        </fieldset>
224
                        </fieldset>
219
                        [% END %]
225
                        [% END %]
220
                      </div>
226
                      </div>
221
                      <div id="import_all">
227
                      <div id="items_info">
222
                        <h2>Import All</h2>
228
                        <h2>Items information</h2>
223
                        <p>Import all the lines in the basket with the following parameters:</p>
229
                        <p>Import all the checked items in the basket with the following parameters:</p>
224
230
225
                        [% IF ( items ) %]
231
                        [% IF ( items ) %]
226
                        <fieldset class="rows">
232
                        <fieldset class="rows" style="float:none;">
227
                            <legend>Item</legend>
233
                            <legend>Item</legend>
228
                            [% IF ( NoACQframework ) %]
234
                            [% IF ( NoACQframework ) %]
229
                                <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
235
                                <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
Lines 249-256 Link Here
249
                            [% END %] <!-- /items -->
255
                            [% END %] <!-- /items -->
250
                        </fieldset>
256
                        </fieldset>
251
                        [% END %] <!-- items -->
257
                        [% END %] <!-- items -->
252
258
                      </div>
253
                        <fieldset class="rows">
259
                      <div id="accounting_details">
260
                        <fieldset class="rows" style="float:none;">
254
                            <legend>Accounting details</legend>
261
                            <legend>Accounting details</legend>
255
                            <ol>
262
                            <ol>
256
                                <li>
263
                                <li>
Lines 329-339 Link Here
329
                                </li>
336
                                </li>
330
                            </ol>
337
                            </ol>
331
                        </fieldset>
338
                        </fieldset>
332
                        <fieldset class="action">
339
                      </div>
333
                            <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
340
                      </div>
334
                        </fieldset>
335
341
336
                        </div>
342
                      <fieldset class="action">
343
                          <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
344
                      </fieldset>
337
                    </form>
345
                    </form>
338
                [% ELSE %]
346
                [% ELSE %]
339
                <div>
347
                <div>
(-)a/t/db_dependent/Budgets.t (-4 / +5 lines)
Lines 3-18 use warnings; Link Here
3
use Test::More tests => 22;
3
use Test::More tests => 22;
4
4
5
BEGIN {use_ok('C4::Budgets') }
5
BEGIN {use_ok('C4::Budgets') }
6
use C4::Context;
6
use C4::Dates;
7
use C4::Dates;
7
use C4::Context;
8
use C4::Context;
8
9
9
use YAML;
10
use YAML;
10
11
my $dbh = C4::Context->dbh;
11
my $dbh = C4::Context->dbh();
12
$dbh->{AutoCommit} = 0;
12
$dbh->{AutoCommit} = 0;
13
$dbh->{RaiseError} = 1;
13
$dbh->{RaiseError} = 1;
14
14
15
$dbh->do('DELETE FROM aqbudgetperiods');
15
$dbh->do(q|DELETE FROM aqbudgetperiods|);
16
$dbh->do(q|DELETE FROM aqbudgets|);
16
17
17
#
18
#
18
# Budget Periods :
19
# Budget Periods :
Lines 134-136 ok($budgets->[0]->{budget_name} lt $budgets->[1]->{budget_name}, 'default sort o Link Here
134
ok($del_status=DelBudget($budget_id),
135
ok($del_status=DelBudget($budget_id),
135
    "DelBudget returned $del_status");
136
    "DelBudget returned $del_status");
136
137
137
- 
138
$dbh->rollback;

Return to bug 7180