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 71-81 Link Here
71
            if ( $(this).is(':checked') ) {
71
            if ( $(this).is(':checked') ) {
72
                $(container).addClass("selected");
72
                $(container).addClass("selected");
73
                $(container).removeClass("unselected");
73
                $(container).removeClass("unselected");
74
                $(container).find("ol").toggle();
74
                $(container).find("ol").toggle(true);
75
            } else {
75
            } else {
76
                $(container).addClass("unselected");
76
                $(container).addClass("unselected");
77
                $(container).removeClass("selected");
77
                $(container).removeClass("selected");
78
                $(container).find("ol").toggle();
78
                $(container).find("ol").toggle(false);
79
            }
79
            }
80
        } );
80
        } );
81
81
Lines 113-124 Link Here
113
113
114
            return disableUnchecked($(this));
114
            return disableUnchecked($(this));
115
        });
115
        });
116
        $('#tabs').tabs();
116
    });
117
    });
117
118
118
    function disableUnchecked(form){
119
    function disableUnchecked(form){
119
        $("div.biblio.unselected").each(function(){
120
        $("div.biblio.unselected").each(function(){
120
            $(this).find('select').attr('disabled', 'disabled');
121
            $(this).remove();
121
            $(this).find('input').attr('disabled', 'disabled');
122
        });
122
        });
123
        return 1;
123
        return 1;
124
    }
124
    }
Lines 137-147 Link Here
137
                <h1>Add orders from [% comments %]
137
                <h1>Add orders from [% comments %]
138
                    ([% file_name %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %])
138
                    ([% file_name %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %])
139
                </h1>
139
                </h1>
140
                <div>
140
                <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
141
                <div id="tabs" class="toptabs">
142
                  <ul>
143
                    <li><a href="#records_to_import">Select to import</a></li>
144
                    <li><a href="#items_info" class="items_info">Items information</a></li>
145
                    <li><a href="#accounting_details">Default accounting details</a></li>
146
                  </ul>
147
141
                  <div id="records_to_import">
148
                  <div id="records_to_import">
142
                    <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
149
                    <span class="checkall"><a id="checkAll" href="#">Check All</a></span>
143
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
150
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck All</a></span>
144
                    <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
145
                        <input type="hidden" name="op" value="import_records"/>
151
                        <input type="hidden" name="op" value="import_records"/>
146
                        <input type="hidden" name="basketno" value="[% basketno %]" />
152
                        <input type="hidden" name="basketno" value="[% basketno %]" />
147
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
153
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
Lines 153-159 Link Here
153
                        [% END %]
159
                        [% END %]
154
160
155
                        [% FOREACH biblio IN biblio_list %]
161
                        [% FOREACH biblio IN biblio_list %]
156
                        <fieldset class="biblio unselected rows">
162
                        <fieldset class="biblio unselected rows" style="float:none;">
157
                          <legend>
163
                          <legend>
158
                            <label for="record_[% biblio.import_record_id %]" style="width:auto;">
164
                            <label for="record_[% biblio.import_record_id %]" style="width:auto;">
159
                              <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
165
                              <input type="checkbox" name="import_record_id" id="record_[% biblio.import_record_id %]" value="[% biblio.import_record_id %]" />
Lines 221-232 Link Here
221
                        </fieldset>
227
                        </fieldset>
222
                        [% END %]
228
                        [% END %]
223
                      </div>
229
                      </div>
224
                      <div id="import_all">
230
                      <div id="items_info">
225
                        <h2>Import all</h2>
231
                        <h2>Items information</h2>
226
                        <p>Import all the lines in the basket with the following parameters:</p>
232
                        <p>Import all the checked items in the basket with the following parameters:</p>
227
233
228
                        [% IF ( items ) %]
234
                        [% IF ( items ) %]
229
                        <fieldset class="rows">
235
                        <fieldset class="rows" style="float:none;">
230
                            <legend>Item</legend>
236
                            <legend>Item</legend>
231
                            [% IF ( NoACQframework ) %]
237
                            [% IF ( NoACQframework ) %]
232
                                <div class="dialog message">No ACQ framework, using default. You should create a framework with code ACQ, the items framework would be used</div>
238
                                <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 258-265 Link Here
258
                            [% END %] <!-- /items -->
264
                            [% END %] <!-- /items -->
259
                        </fieldset>
265
                        </fieldset>
260
                        [% END %] <!-- items -->
266
                        [% END %] <!-- items -->
261
267
                      </div>
262
                        <fieldset class="rows">
268
                      <div id="accounting_details">
269
                        <fieldset class="rows" style="float:none;">
263
                            <legend>Accounting details</legend>
270
                            <legend>Accounting details</legend>
264
                            <ol>
271
                            <ol>
265
                                <li>
272
                                <li>
Lines 342-352 Link Here
342
                                </li>
349
                                </li>
343
                            </ol>
350
                            </ol>
344
                        </fieldset>
351
                        </fieldset>
345
                        <fieldset class="action">
352
                      </div>
346
                            <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
353
                      </div>
347
                        </fieldset>
348
354
349
                        </div>
355
                      <fieldset class="action">
356
                          <input type="submit" value="Save" /><a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno %]">Cancel</a>
357
                      </fieldset>
350
                    </form>
358
                    </form>
351
                [% ELSE %]
359
                [% ELSE %]
352
                <div>
360
                <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