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

(-)a/Koha/MarcOrder.pm (-3 / +4 lines)
Lines 48-53 use C4::Biblio qw( Link Here
48
    AddBiblio
48
    AddBiblio
49
    GetMarcFromKohaField
49
    GetMarcFromKohaField
50
    TransformHtmlToXml
50
    TransformHtmlToXml
51
    GetMarcQuantity
51
);
52
);
52
use C4::Items   qw( AddItemFromMarc );
53
use C4::Items   qw( AddItemFromMarc );
53
use C4::Budgets qw( GetBudgetByCode );
54
use C4::Budgets qw( GetBudgetByCode );
Lines 171-177 sub import_record_and_create_order_lines { Link Here
171
    my ( $self, $args ) = @_;
172
    my ( $self, $args ) = @_;
172
173
173
    my $import_batch_id           = $args->{import_batch_id};
174
    my $import_batch_id           = $args->{import_batch_id};
174
    my @import_record_id_selected = $args->{import_record_id_selected} || ();
175
    my $import_record_id_selected = $args->{import_record_id_selected} || ();
175
    my $matcher_id                = $args->{matcher_id};
176
    my $matcher_id                = $args->{matcher_id};
176
    my $overlay_action            = $args->{overlay_action};
177
    my $overlay_action            = $args->{overlay_action};
177
    my $import_record             = $args->{import_record};
178
    my $import_record             = $args->{import_record};
Lines 438-444 sub add_biblio_from_import_record { Link Here
438
    my ($args) = @_;
439
    my ($args) = @_;
439
440
440
    my $import_batch_id           = $args->{import_batch_id};
441
    my $import_batch_id           = $args->{import_batch_id};
441
    my @import_record_id_selected = $args->{import_record_id_selected} || ();
442
    my $import_record_id_selected = $args->{import_record_id_selected} || ();
442
    my $matcher_id                = $args->{matcher_id};
443
    my $matcher_id                = $args->{matcher_id};
443
    my $overlay_action            = $args->{overlay_action};
444
    my $overlay_action            = $args->{overlay_action};
444
    my $import_record             = $args->{import_record};
445
    my $import_record             = $args->{import_record};
Lines 451-457 sub add_biblio_from_import_record { Link Here
451
            record_result       => 0,
452
            record_result       => 0,
452
            duplicates_in_batch => 0,
453
            duplicates_in_batch => 0,
453
            skip                => 1
454
            skip                => 1
454
        } if not grep { $_ eq $import_record->import_record_id } @import_record_id_selected;
455
        } if not grep { $_ eq $import_record->import_record_id } @{$import_record_id_selected};
455
    }
456
    }
456
457
457
    my $marcrecord   = $import_record->get_marc_record || die "Couldn't translate marc information";
458
    my $marcrecord   = $import_record->get_marc_record || die "Couldn't translate marc information";
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt (-19 / +127 lines)
Lines 7-15 Link Here
7
<title>
7
<title>
8
MARC Order Accounts
8
MARC Order Accounts
9
</title>
9
</title>
10
<style>
11
    #fileuploadstatus,#fileuploadfailed,#fileuploadcancel { display : none; }
12
</style>
13
[% INCLUDE 'doc-head-close.inc' %]
10
[% INCLUDE 'doc-head-close.inc' %]
14
</head>
11
</head>
15
<body id="admin_marc_order_acct" class="admin">
12
<body id="admin_marc_order_acct" class="admin">
Lines 138-156 MARC Order Accounts Link Here
138
                                <li>
135
                                <li>
139
                                        <label for='record_type'>Record type:</label>
136
                                        <label for='record_type'>Record type:</label>
140
                                        <select name='record_type' id='record_type'>
137
                                        <select name='record_type' id='record_type'>
141
                                            <option value='biblio' selected='selected'>Bibliographic</option>
138
                                            [% IF ( account.record_type == 'biblio' ) %]
142
                                            <option value='auth'>Authority</option>
139
                                                <option value="biblio" selected="selected">
140
                                            [% ELSE %]
141
                                                <option value="biblio">
142
                                            [% END %]
143
                                                Bibliographic</option>
144
                                            [% IF ( account.record_type == 'auth' ) %]
145
                                                <option value="auth" selected="selected">
146
                                            [% ELSE %]
147
                                                <option value="auth">
148
                                            [% END %]
149
                                                Authority</option>
143
                                        </select>
150
                                        </select>
144
                                    </li>
151
                                    </li>
145
                                    <li>
152
                                    <li>
146
                                        <label for="encoding">Character encoding: </label>
153
                                        <label for="encoding">Character encoding: </label>
147
                                        <select name="encoding" id="encoding">
154
                                        <select name="encoding" id="encoding">
148
                                            <option value="UTF-8" selected="selected">UTF-8 (Default)</option>
155
                                            [% IF ( account.encoding == 'UTF-8' ) %]
149
                                            <option value="MARC-8">MARC 8</option>
156
                                                <option value="UTF-8" selected="selected">
150
                                            <option value="ISO_5426">ISO 5426</option>
157
                                            [% ELSE %]
151
                                            <option value="ISO_6937">ISO 6937</option>
158
                                                <option value="UTF-8">
152
                                            <option value="ISO_8859-1">ISO 8859-1</option>
159
                                            [% END %]
153
                                            <option value="EUC-KR">EUC-KR</option>
160
                                                UTF-8 (Default)</option>
161
                                            [% IF ( account.encoding == 'MARC-8' ) %]
162
                                                <option value="MARC-8" selected="selected">
163
                                            [% ELSE %]
164
                                                <option value="MARC-8">
165
                                            [% END %]
166
                                                MARC 8</option>
167
                                            [% IF ( account.encoding == 'ISO_5426' ) %]
168
                                                <option value="ISO_5426" selected="selected">
169
                                            [% ELSE %]
170
                                                <option value="ISO_5426">
171
                                            [% END %]
172
                                                ISO 5426</option>
173
                                            [% IF ( account.encoding == 'ISO_6937' ) %]
174
                                                <option value="ISO_6937" selected="selected">
175
                                            [% ELSE %]
176
                                                <option value="ISO_6937">
177
                                            [% END %]
178
                                                ISO 6937</option>
179
                                            [% IF ( account.encoding == 'ISO_8859-1' ) %]
180
                                                <option value="ISO_8859-1" selected="selected">
181
                                            [% ELSE %]
182
                                                <option value="ISO_8859-1">
183
                                            [% END %]
184
                                                ISO 8859-1</option>
185
                                            [% IF ( account.encoding == 'EUC-KR' ) %]
186
                                                <option value="EUC-KR" selected="selected">
187
                                            [% ELSE %]
188
                                                <option value="EUC-KR">
189
                                            [% END %]
190
                                                EUC-KR</option>
154
                                        </select>
191
                                        </select>
155
                                    </li>
192
                                    </li>
156
                            </ol>
193
                            </ol>
Lines 162-168 MARC Order Accounts Link Here
162
                                    <label for="matcher">Record matching rule:</label>
199
                                    <label for="matcher">Record matching rule:</label>
163
                                    <select name="matcher" id="matcher">
200
                                    <select name="matcher" id="matcher">
164
                                        [% FOREACH available_matcher IN available_matchers %]
201
                                        [% FOREACH available_matcher IN available_matchers %]
165
                                            [% IF available_matcher.id == account.matcher_id %]
202
                                            [% IF available_matcher.matcher_id == account.matcher_id %]
166
                                                <option value="[% available_matcher.matcher_id | html %]" selected="selected">[% available_matcher.code | html %] ([% available_matcher.description | html %])</option>
203
                                                <option value="[% available_matcher.matcher_id | html %]" selected="selected">[% available_matcher.code | html %] ([% available_matcher.description | html %])</option>
167
                                            [% ELSE %]
204
                                            [% ELSE %]
168
                                                <option value="[% available_matcher.matcher_id | html %]">[% available_matcher.code | html %] ([% available_matcher.description | html %])</option>
205
                                                <option value="[% available_matcher.matcher_id | html %]">[% available_matcher.code | html %] ([% available_matcher.description | html %])</option>
Lines 172-182 MARC Order Accounts Link Here
172
                                </li>
209
                                </li>
173
                                <li>
210
                                <li>
174
                                    <label for="overlay_action">Action if matching record found: </label>
211
                                    <label for="overlay_action">Action if matching record found: </label>
175
                                    [% INCLUDE 'tools-overlay-action.inc' %]
212
                                    <select name="overlay_action" id="overlay_action">
213
                                        [% IF ( account.overlay_action == 'replace' ) %]
214
                                            <option value="replace"  selected="selected">
215
                                        [% ELSE %]
216
                                            <option value="replace">
217
                                        [% END %]
218
                                            Replace existing record with incoming record</option>
219
                                        [% IF ( account.overlay_action == 'create_new' ) %]
220
                                            <option value="create_new" selected="selected">
221
                                        [% ELSE %]
222
                                            <option value="create_new">
223
                                        [% END %]
224
                                            Add incoming record</option>
225
                                        [% IF ( account.overlay_action == 'ignore' ) %]
226
                                            <option value="ignore" selected="selected">
227
                                        [% ELSE %]
228
                                            <option value="ignore">
229
                                        [% END %]
230
                                            Ignore incoming record (its items may still be processed)</option>
231
                                    </select>
176
                                </li>
232
                                </li>
177
                                <li>
233
                                <li>
178
                                    <label for="nomatch_action">Action if no match is found: </label>
234
                                    <label for="nomatch_action">Action if no match is found: </label>
179
                                    [% INCLUDE 'tools-nomatch-action.inc' %]
235
                                    <select name="nomatch_action" id="nomatch_action">
236
                                        [% IF ( account.nomatch_action == 'create_new' ) %]
237
                                            <option value="create_new" selected="selected">
238
                                        [% ELSE %]
239
                                            <option value="create_new">
240
                                        [% END %]
241
                                            Add incoming record</option>
242
                                        [% IF ( account.nomatch_action == 'ignore' ) %]
243
                                            <option value="ignore" selected="selected">
244
                                        [% ELSE %]
245
                                            <option value="ignore">
246
                                        [% END %]
247
                                            Ignore incoming record</option>
248
                                    </select>
180
                                </li>
249
                                </li>
181
                            </ol>
250
                            </ol>
182
                        </fieldset>
251
                        </fieldset>
Lines 184-200 MARC Order Accounts Link Here
184
                            <legend>Check for embedded item record data?</legend>
253
                            <legend>Check for embedded item record data?</legend>
185
                            <ol>
254
                            <ol>
186
                                <li class="radio">
255
                                <li class="radio">
187
                                    <input type="radio" id="parse_itemsyes" name="parse_items" value="1" checked="checked" />
256
                                    [% IF ( account.parse_items == 1 || !account ) %]
257
                                        <input type="radio" id="parse_itemsyes" name="parse_items" value="1" checked="checked" />
258
                                    [% ELSE %]
259
                                        <input type="radio" id="parse_itemsyes" name="parse_items" value="1" />
260
                                    [% END %]
188
                                    <label for="parse_itemsyes">Yes</label>
261
                                    <label for="parse_itemsyes">Yes</label>
189
                                </li>
262
                                </li>
190
                                <li class="radio">
263
                                <li class="radio">
191
                                    <input type="radio" id="parse_itemsno" name="parse_items" value="0" />
264
                                    [% IF ( account.parse_items == 0 ) %]
265
                                        <input type="radio" id="parse_itemsno" name="parse_items" value="0" checked="checked" />
266
                                    [% ELSE %]
267
                                        <input type="radio" id="parse_itemsno" name="parse_items" value="0" />
268
                                    [% END %]
192
                                    <label for="parse_itemsno">No</label>
269
                                    <label for="parse_itemsno">No</label>
193
                                </li>
270
                                </li>
194
                            </ol>
271
                            </ol>
195
                            <ol>
272
                            <ol>
196
                                <li><label for="item_action">How to process items: </label>
273
                                <li>
197
                                    [% INCLUDE 'tools-item-action.inc' %]
274
                                    <label for="item_action">How to process items: </label>
275
                                    <select name="item_action" id="item_action">
276
                                    [% IF ( account.item_action == 'always_add' ) %]
277
                                        <option value="always_add" selected="selected">
278
                                    [% ELSE %]
279
                                        <option value="always_add">
280
                                    [% END %]
281
                                        Always add items</option>
282
                                    [% IF ( account.item_action == 'add_only_for_matches' ) %]
283
                                        <option value="add_only_for_matches" selected="selected">
284
                                    [% ELSE %]
285
                                        <option value="add_only_for_matches">
286
                                    [% END %]
287
                                        Add items only if matching bib was found</option>
288
                                    [% IF ( account.item_action == 'add_only_for_new' ) %]
289
                                        <option value="add_only_for_new" selected="selected">
290
                                    [% ELSE %]
291
                                        <option value="add_only_for_new">
292
                                    [% END %]
293
                                        Add items only if no matching bib was found</option>
294
                                    [% IF ( account.item_action == 'replace' ) %]
295
                                        <option value="replace" selected="selected">
296
                                    [% ELSE %]
297
                                        <option value="replace">
298
                                    [% END %]
299
                                        Replace items if matching bib was found (only for existing items)</option>
300
                                    [% IF ( account.item_action == 'ignore' ) %]
301
                                        <option value="ignore" selected="selected">
302
                                    [% ELSE %]
303
                                        <option value="ignore">
304
                                    [% END %]
305
                                        Ignore items</option>
306
                                    </select>
198
                                </li>
307
                                </li>
199
                            </ol>
308
                            </ol>
200
                        </fieldset>
309
                        </fieldset>
201
- 

Return to bug 34355