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

(-)a/C4/Items.pm (+1 lines)
Lines 1162-1167 sub GetItemsForInventory { Link Here
1162
        # Auth values
1162
        # Auth values
1163
        foreach (keys %$row) {
1163
        foreach (keys %$row) {
1164
            if (defined($avmapping->{"items.$_,".$row->{'frameworkcode'}.",".$row->{$_}})) {
1164
            if (defined($avmapping->{"items.$_,".$row->{'frameworkcode'}.",".$row->{$_}})) {
1165
                $row->{"$_-code"} = $row->{$_};
1165
                $row->{$_} = $avmapping->{"items.$_,".$row->{'frameworkcode'}.",".$row->{$_}};
1166
                $row->{$_} = $avmapping->{"items.$_,".$row->{'frameworkcode'}.",".$row->{$_}};
1166
            }
1167
            }
1167
        }
1168
        }
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt (+15 lines)
Lines 196-201 $(document).ready(function(){ Link Here
196
            </fieldset>
196
            </fieldset>
197
        [% END %]
197
        [% END %]
198
198
199
        [% IF (authorised_values) %]
200
            <fieldset class="rows">
201
                <legend>If comparing barcodes list to results, assume items with the following locations should not have been scanned</legend>
202
203
                <ol>
204
                    [% FOREACH value IN authorised_values %]
205
                        <li>
206
                            <label for="ignore_locations">[% value.lib %]</label>
207
                            <input type="checkbox" name="ignore_locations" value="[% value.authorised_value %]">
208
                        </li>
209
                    [% END %]
210
                </ol>
211
            </fieldset>
212
        [% END %]
213
199
        <fieldset class="rows wide">
214
        <fieldset class="rows wide">
200
          <ol>
215
          <ol>
201
        <li><label for="datelastseen">Inventory date:</label>
216
        <li><label for="datelastseen">Inventory date:</label>
(-)a/tools/inventory.pl (-4 / +6 lines)
Lines 37-43 use C4::Circulation; Link Here
37
use C4::Reports::Guided;    #_get_column_defs
37
use C4::Reports::Guided;    #_get_column_defs
38
use C4::Charset;
38
use C4::Charset;
39
use Koha::DateUtils;
39
use Koha::DateUtils;
40
use List::MoreUtils qw( none );
40
use List::MoreUtils qw( none any );
41
41
42
42
43
my $minlocation=$input->param('minlocation') || '';
43
my $minlocation=$input->param('minlocation') || '';
Lines 55-60 my $op = $input->param('op'); Link Here
55
my $compareinv2barcd = $input->param('compareinv2barcd');
55
my $compareinv2barcd = $input->param('compareinv2barcd');
56
my $dont_checkin = $input->param('dont_checkin');
56
my $dont_checkin = $input->param('dont_checkin');
57
my $out_of_order = $input->param('out_of_order');
57
my $out_of_order = $input->param('out_of_order');
58
my @ignore_locations = $input->param('ignore_locations');
58
59
59
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
60
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
60
    {   template_name   => "tools/inventory.tt",
61
    {   template_name   => "tools/inventory.tt",
Lines 367-374 if ( $compareinv2barcd ) { Link Here
367
    for my $should_be_scanned ( @$inventorylist ) {
368
    for my $should_be_scanned ( @$inventorylist ) {
368
        my $barcode = $should_be_scanned->{barcode};
369
        my $barcode = $should_be_scanned->{barcode};
369
        unless ( grep /^$barcode$/, @scanned_barcodes ) {
370
        unless ( grep /^$barcode$/, @scanned_barcodes ) {
370
            $should_be_scanned->{problem} = 'not_scanned';
371
            unless ( any { $should_be_scanned->{'location-code'} eq $_ } @ignore_locations ) {
371
            push @items_with_problems, { %$should_be_scanned };
372
                $should_be_scanned->{problem} = 'not_scanned';
373
                push @items_with_problems, { %$should_be_scanned };
374
            }
372
        }
375
        }
373
    }
376
    }
374
}
377
}
375
- 

Return to bug 11405