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

(-)a/tools/inventory.pl (-17 / +4 lines)
Lines 86-91 for my $fwk ( @$frameworks ){ Link Here
86
}
86
}
87
87
88
my $statuses = [];
88
my $statuses = [];
89
my @notforloans;
89
for my $statfield (qw/items.notforloan items.itemlost items.withdrawn items.damaged/){
90
for my $statfield (qw/items.notforloan items.itemlost items.withdrawn items.damaged/){
90
    my $hash = {};
91
    my $hash = {};
91
    $hash->{fieldname} = $statfield;
92
    $hash->{fieldname} = $statfield;
Lines 95-100 for my $statfield (qw/items.notforloan items.itemlost items.withdrawn items.dama Link Here
95
        my $arr = GetAuthorisedValues($hash->{authcode});
96
        my $arr = GetAuthorisedValues($hash->{authcode});
96
        $hash->{values} = $arr;
97
        $hash->{values} = $arr;
97
        push @$statuses, $hash;
98
        push @$statuses, $hash;
99
        if ( $statfield eq 'items.notforloan') {
100
            @notforloans = map { $_->{'authorised_value'} } @$arr;
101
        }
98
    }
102
    }
99
}
103
}
100
104
Lines 110-125 for my $authvfield (@$statuses) { Link Here
110
    }
114
    }
111
}
115
}
112
116
113
my $notforloanlist;
114
my $statussth = '';
115
for my $authvfield (@$statuses) {
116
    if ( scalar @{$staton->{$authvfield->{fieldname}}} > 0 ){
117
        my $joinedvals = join ',', @{$staton->{$authvfield->{fieldname}}};
118
        $statussth .= "$authvfield->{fieldname} in ($joinedvals) and ";
119
        $notforloanlist = $joinedvals if ($authvfield->{fieldname} eq "items.notforloan");
120
    }
121
}
122
$statussth =~ s, and $,,g;
123
$template->param(
117
$template->param(
124
    authorised_values        => \@authorised_value_list,
118
    authorised_values        => \@authorised_value_list,
125
    today                    => dt_from_string,
119
    today                    => dt_from_string,
Lines 131-144 $template->param( Link Here
131
    branch                   => $branch,
125
    branch                   => $branch,
132
    datelastseen             => $datelastseen,
126
    datelastseen             => $datelastseen,
133
    compareinv2barcd         => $compareinv2barcd,
127
    compareinv2barcd         => $compareinv2barcd,
134
    notforloanlist           => $notforloanlist
135
);
128
);
136
129
137
my @notforloans;
138
if (defined $notforloanlist) {
139
    @notforloans = split(/,/, $notforloanlist);
140
}
141
142
my @scanned_items;
130
my @scanned_items;
143
my @errorloop;
131
my @errorloop;
144
if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) {
132
if ( $uploadbarcodes && length($uploadbarcodes) > 0 ) {
145
- 

Return to bug 12913