projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 8220 - Allow koc uploads to go to process queue instead of being applied directly.
[koha_fer]
/
tools
/
inventory.pl
diff --git
a/tools/inventory.pl
b/tools/inventory.pl
index
cc7e8a7
..
fdf3161
100755
(executable)
--- a/
tools/inventory.pl
+++ b/
tools/inventory.pl
@@
-77,6
+77,8
@@
my @authorised_value_list;
my $authorisedvalue_categories = '';
my $frameworks = getframeworks();
my $authorisedvalue_categories = '';
my $frameworks = getframeworks();
+$frameworks->{''} = {frameworkcode => ''}; # Add the default framework
+
for my $fwk (keys %$frameworks){
my $fwkcode = $frameworks->{$fwk}->{'frameworkcode'};
my $authcode = GetAuthValCode('items.location', $fwkcode);
for my $fwk (keys %$frameworks){
my $fwkcode = $frameworks->{$fwk}->{'frameworkcode'};
my $authcode = GetAuthValCode('items.location', $fwkcode);
@@
-123,7
+125,6
@@
$statussth =~ s, and $,,g;
$template->param(branchloop => \@branch_loop,
authorised_values=>\@authorised_value_list,
$template->param(branchloop => \@branch_loop,
authorised_values=>\@authorised_value_list,
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
today => C4::Dates->today(),
minlocation => $minlocation,
maxlocation => $maxlocation,
today => C4::Dates->today(),
minlocation => $minlocation,
maxlocation => $maxlocation,
@@
-194,7
+195,7
@@
if ( ! ($uploadbarcodes && length($uploadbarcodes)>0 ) || ( $input->param('compa
if ( defined $input->param('compareinv2barcd') && ( ( $input->param('compareinv2barcd') eq 'on' ) && ( scalar @brcditems != scalar @$res ) ) && length($uploadbarcodes) > 0 ){
if ( scalar @brcditems > scalar @$res ){
for my $brcditem (@brcditems) {
if ( defined $input->param('compareinv2barcd') && ( ( $input->param('compareinv2barcd') eq 'on' ) && ( scalar @brcditems != scalar @$res ) ) && length($uploadbarcodes) > 0 ){
if ( scalar @brcditems > scalar @$res ){
for my $brcditem (@brcditems) {
- if (! grep(
/$brcditem->{barcode}/
, @$res) ){
+ if (! grep(
$_->{barcode} =~ /$brcditem->{barcode}/
, @$res) ){
$brcditem->{notfoundkoha} = 1;
push @$res, $brcditem;
}
$brcditem->{notfoundkoha} = 1;
push @$res, $brcditem;
}
@@
-202,7
+203,7
@@
if ( ! ($uploadbarcodes && length($uploadbarcodes)>0 ) || ( $input->param('compa
} else {
my @notfound;
for my $item (@$res) {
} else {
my @notfound;
for my $item (@$res) {
- if ( ! grep(
/$item->{barcode}/
, @brcditems) ){
+ if ( ! grep(
$_->{barcode} =~ /$item->{barcode}/
, @brcditems) ){
$item->{notfoundbarcode} = 1;
push @notfound, $item;
}
$item->{notfoundbarcode} = 1;
push @notfound, $item;
}