X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FCustomerVendor.pm;h=2f8b15c06314c09d013c05a43ebca2e47e9edb1c;hb=c4a682432dda2b3e3e9aea823dee83aa8e99f224;hp=8fc893d115fba33731b391e3c07771815127ffe1;hpb=1427d96a209258589277eb22433e9b5c37289fcf;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm index 8fc893d11..2f8b15c06 100644 --- a/SL/Controller/CsvImport/CustomerVendor.pm +++ b/SL/Controller/CsvImport/CustomerVendor.pm @@ -68,7 +68,7 @@ sub check_objects { my %vcs_by_number = map { ( $_->$numbercolumn => $_ ) } @{ $self->existing_objects }; my $methods = $self->controller->headers->{methods}; - my $i; + my $i = 0; my $num_data = scalar @{ $self->controller->data }; foreach my $entry (@{ $self->controller->data }) { $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0; @@ -91,7 +91,7 @@ sub check_objects { push @{ $entry->{information} }, $::locale->text('Illegal characters have been removed from the following fields: #1', join(', ', @cleaned_fields)) if @cleaned_fields; - my $existing_vc = $vcs_by_number{ $object->$numbercolumn }; + my $existing_vc = $object->$numbercolumn ? $vcs_by_number{ $object->$numbercolumn } : undef; if (!$existing_vc) { $vcs_by_number{ $object->$numbercolumn } = $object if $object->$numbercolumn; @@ -240,8 +240,8 @@ sub save_objects { my ($self, %params) = @_; my $numbercolumn = $self->table . 'number'; - my $with_number = [ grep { $_->{object}->$numbercolumn ne '####' } @{ $self->controller->data } ]; - my $without_number = [ grep { $_->{object}->$numbercolumn eq '####' } @{ $self->controller->data } ]; + my $with_number = [ grep { ($_->{object}->$numbercolumn || '') ne '####' } @{ $self->controller->data } ]; + my $without_number = [ grep { ($_->{object}->$numbercolumn || '') eq '####' } @{ $self->controller->data } ]; $_->{object}->$numbercolumn('') for @{ $without_number };