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

(-)a/acqui/addorderiso2709.pl (-2 / +9 lines)
Lines 31-37 use C4::Auth; Link Here
31
use C4::Output;
31
use C4::Output;
32
use C4::ImportBatch;
32
use C4::ImportBatch;
33
use C4::Matcher;
33
use C4::Matcher;
34
use C4::Search qw/FindDuplicate/;
35
use C4::Acquisition;
34
use C4::Acquisition;
36
use C4::Biblio;
35
use C4::Biblio;
37
use C4::Items;
36
use C4::Items;
Lines 141-146 if ($op eq ""){ Link Here
141
    my @discount = $input->multi_param('discount');
140
    my @discount = $input->multi_param('discount');
142
    my @sort1 = $input->multi_param('sort1');
141
    my @sort1 = $input->multi_param('sort1');
143
    my @sort2 = $input->multi_param('sort2');
142
    my @sort2 = $input->multi_param('sort2');
143
    my $matcher_id = $input->multi_param('matcher_id');
144
    my $active_currency = Koha::Acquisition::Currencies->get_active;
144
    my $active_currency = Koha::Acquisition::Currencies->get_active;
145
    for my $biblio (@$biblios){
145
    for my $biblio (@$biblios){
146
        # Check if this import_record_id was selected
146
        # Check if this import_record_id was selected
Lines 158-164 if ($op eq ""){ Link Here
158
158
159
        # 1st insert the biblio, or find it through matcher
159
        # 1st insert the biblio, or find it through matcher
160
        unless ( $biblionumber ) {
160
        unless ( $biblionumber ) {
161
            $duplinbatch=$import_batch_id and next if FindDuplicate($marcrecord);
161
            if ($matcher_id) {
162
                my $matcher = C4::Matcher->fetch($matcher_id);
163
                my @matches = $matcher->get_matches( $marcrecord, my $max_matches = 1 );
164
                if ( @matches ) {
165
                    $duplinbatch = $import_batch_id;
166
                    next;
167
                }
168
            }
162
            # add the biblio
169
            # add the biblio
163
            my $bibitemnum;
170
            my $bibitemnum;
164
171
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-5 / +31 lines)
Lines 189-198 Link Here
189
                  </ul>
189
                  </ul>
190
190
191
                  <div id="records_to_import">
191
                  <div id="records_to_import">
192
                    <span class="checkall"><a id="checkAll" href="#">Check all</a></span>
192
                    <div id="searchheader">
193
                    <span class="uncheckall"><a id="unCheckAll" href="#">Uncheck all</a></span>
193
                        <div>
194
                    <label for="showallbudgets" style="float:none;width:auto;">&nbsp;Show inactive funds:</label>
194
                            <span class="checkall"><a id="checkAll" href="#">Select all</a></span>
195
                    <input type="checkbox" id="showallbudgets" />
195
                            |
196
                            <span class="uncheckall"><a id="unCheckAll" href="#">Clear all</a></span>
197
                            |
198
                            <span>
199
                                <label for="matcher_id">Matching:</label>
200
                                    <select name="matcher_id" id="matcher_id">
201
                                        <option value="">Do not look for matching records</option>
202
                                        [% FOREACH available_matcher IN available_matchers %]
203
                                            [% IF ( available_matcher.code == current_matcher_code ) %]
204
                                                <option value="[% available_matcher.matcher_id %]" selected="selected">
205
                                                    [% available_matcher.code %] ([% available_matcher.description %])
206
                                                </option>
207
                                            [% ELSE %]
208
                                                <option value="[% available_matcher.matcher_id %]">
209
                                                    [% available_matcher.code %] ([% available_matcher.description %])
210
                                                </option>
211
                                            [% END %]
212
                                        [% END %]
213
                                    </select>
214
                            </span>
215
                            |
216
                            <span>
217
                                <label for="showallbudgets" style="float:none;width:auto;">&nbsp;Show inactive funds:</label>
218
                                <input type="checkbox" id="showallbudgets" />
219
                            </span>
220
                        </div>
221
                    </div>
222
196
                        <input type="hidden" name="op" value="import_records"/>
223
                        <input type="hidden" name="op" value="import_records"/>
197
                        <input type="hidden" name="basketno" value="[% basketno %]" />
224
                        <input type="hidden" name="basketno" value="[% basketno %]" />
198
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
225
                        <input type="hidden" name="booksellerid" value="[% booksellerid %]" />
199
- 

Return to bug 16493