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

(-)a/C4/Items.pm (+6 lines)
Lines 572-577 sub GetItemsForInventory { Link Here
572
    my $minlocation  = $parameters->{'minlocation'}  // '';
572
    my $minlocation  = $parameters->{'minlocation'}  // '';
573
    my $maxlocation  = $parameters->{'maxlocation'}  // '';
573
    my $maxlocation  = $parameters->{'maxlocation'}  // '';
574
    my $class_source = $parameters->{'class_source'}  // C4::Context->preference('DefaultClassificationSource');
574
    my $class_source = $parameters->{'class_source'}  // C4::Context->preference('DefaultClassificationSource');
575
    my $items_bundle = $parameters->{'items_bundle'} // '';
575
    my $location     = $parameters->{'location'}     // '';
576
    my $location     = $parameters->{'location'}     // '';
576
    my $itemtype     = $parameters->{'itemtype'}     // '';
577
    my $itemtype     = $parameters->{'itemtype'}     // '';
577
    my $ignoreissued = $parameters->{'ignoreissued'} // '';
578
    my $ignoreissued = $parameters->{'ignoreissued'} // '';
Lines 625-630 sub GetItemsForInventory { Link Here
625
        push @bind_params, $max_cnsort;
626
        push @bind_params, $max_cnsort;
626
    }
627
    }
627
628
629
    if ($items_bundle) {
630
        push @where_strings, 'items.itemnumber IN (SELECT itemnumber FROM items_bundle_item WHERE items_bundle_id = ?)';
631
        push @bind_params, $items_bundle;
632
    }
633
628
    if ($datelastseen) {
634
    if ($datelastseen) {
629
        push @where_strings, '(datelastseen < ? OR datelastseen IS NULL)';
635
        push @where_strings, '(datelastseen < ? OR datelastseen IS NULL)';
630
        push @bind_params, $datelastseen;
636
        push @bind_params, $datelastseen;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (-1 / +19 lines)
Lines 174-179 Link Here
174
                                    </select>
174
                                    </select>
175
                                </li>
175
                                </li>
176
                            </li>
176
                            </li>
177
                            [% IF items_bundles.size > 0 %]
178
                                <li>
179
                                    <label for="items_bundle">Items bundle:</label>
180
                                    <select id="items_bundle" name="items_bundle">
181
                                        <option value=""></option>
182
                                        [% FOREACH items_bundle IN items_bundles %]
183
                                            <option value="[% items_bundle.items_bundle_id | html %]">[% items_bundle.biblionumber.title | html %]</option>
184
                                        [% END %]
185
                                    </select>
186
                                </li>
187
                            [% END %]
177
                        </ol>
188
                        </ol>
178
                    </fieldset>
189
                    </fieldset>
179
190
Lines 416-422 Link Here
416
                    $('#locationloop').val() ||
427
                    $('#locationloop').val() ||
417
                    $('#minlocation').val()  ||
428
                    $('#minlocation').val()  ||
418
                    $('#maxlocation').val()  ||
429
                    $('#maxlocation').val()  ||
419
                    $('#statuses input:checked').length
430
                    $('#statuses input:checked').length ||
431
                    $('#items_bundle').val()
420
                ) ) {
432
                ) ) {
421
                    return confirm(
433
                    return confirm(
422
                        _("You have not selected any catalog filters and are about to compare a file of barcodes to your entire catalog.") + "\n\n" +
434
                        _("You have not selected any catalog filters and are about to compare a file of barcodes to your entire catalog.") + "\n\n" +
Lines 557-562 Link Here
557
            });
569
            });
558
        });
570
        });
559
    </script>
571
    </script>
572
    [% INCLUDE 'select2.inc' %]
573
    <script>
574
        $(document).ready(function () {
575
            $('#items_bundle').select2();
576
        });
577
    </script>
560
[% END %]
578
[% END %]
561
579
562
[% INCLUDE 'intranet-bottom.inc' %]
580
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/tools/inventory.pl (-1 / +10 lines)
Lines 49-54 my $minlocation=$input->param('minlocation') || ''; Link Here
49
my $maxlocation=$input->param('maxlocation');
49
my $maxlocation=$input->param('maxlocation');
50
my $class_source=$input->param('class_source');
50
my $class_source=$input->param('class_source');
51
$maxlocation=$minlocation.'Z' unless ( $maxlocation || ! $minlocation );
51
$maxlocation=$minlocation.'Z' unless ( $maxlocation || ! $minlocation );
52
my $items_bundle = $input->param('items_bundle');
52
my $location=$input->param('location') || '';
53
my $location=$input->param('location') || '';
53
my $ignoreissued=$input->param('ignoreissued');
54
my $ignoreissued=$input->param('ignoreissued');
54
my $ignore_waiting_holds = $input->param('ignore_waiting_holds');
55
my $ignore_waiting_holds = $input->param('ignore_waiting_holds');
Lines 69-74 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
69
    }
70
    }
70
);
71
);
71
72
73
my $schema = Koha::Database->new()->schema();
74
my $items_bundle_rs = $schema->resultset('ItemsBundle');
75
my @items_bundles = $items_bundle_rs->search(undef, {
76
    order_by => { -asc => ['biblionumber.title'] },
77
    join => ['biblionumber'],
78
});
72
my @authorised_value_list;
79
my @authorised_value_list;
73
my $authorisedvalue_categories = '';
80
my $authorisedvalue_categories = '';
74
81
Lines 140-145 foreach my $itemtype ( @itemtypes ) { Link Here
140
147
141
$template->param(
148
$template->param(
142
    authorised_values        => \@authorised_value_list,
149
    authorised_values        => \@authorised_value_list,
150
    items_bundles            => \@items_bundles,
143
    today                    => dt_from_string,
151
    today                    => dt_from_string,
144
    minlocation              => $minlocation,
152
    minlocation              => $minlocation,
145
    maxlocation              => $maxlocation,
153
    maxlocation              => $maxlocation,
Lines 257-262 if ( $op eq 'cud-inventory' && ( !$uploadbarcodes || $compareinv2barcd )) { Link Here
257
      minlocation  => $minlocation,
265
      minlocation  => $minlocation,
258
      maxlocation  => $maxlocation,
266
      maxlocation  => $maxlocation,
259
      class_source => $class_source,
267
      class_source => $class_source,
268
      items_bundle => $items_bundle,
260
      location     => $location,
269
      location     => $location,
261
      ignoreissued => $ignoreissued,
270
      ignoreissued => $ignoreissued,
262
      datelastseen => $datelastseen,
271
      datelastseen => $datelastseen,
Lines 277-282 if( @scanned_items ) { Link Here
277
      maxlocation  => $maxlocation,
286
      maxlocation  => $maxlocation,
278
      class_source => $class_source,
287
      class_source => $class_source,
279
      location     => $location,
288
      location     => $location,
289
      items_bundle => $items_bundle,
280
      ignoreissued => undef,
290
      ignoreissued => undef,
281
      datelastseen => undef,
291
      datelastseen => undef,
282
      branchcode   => $branchcode,
292
      branchcode   => $branchcode,
283
- 

Return to bug 29099