X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FCustomerVendor.pm;h=e42a93df86262460e9415d9c54fb76b466d34f6a;hb=58fdd50dbb6b909d48b2846f36857b2bd2219441;hp=e8cfc367d985643e005ef09b2555159c3fee435c;hpb=220ccac9cc13afd496050420c635c50d4a65c2c5;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm index e8cfc367d..e42a93df8 100644 --- a/SL/Controller/CsvImport/CustomerVendor.pm +++ b/SL/Controller/CsvImport/CustomerVendor.pm @@ -52,12 +52,14 @@ sub check_objects { foreach my $entry (@{ $self->controller->data }) { my $object = $entry->{object}; - next unless $self->check_name($entry); - next unless $self->check_language($entry); - next unless $self->check_business($entry); - next unless $self->check_payment($entry); + $self->check_name($entry); + $self->check_language($entry); + $self->check_business($entry); + $self->check_payment($entry); $self->handle_cvars($entry); + next if @{ $entry->{errors} }; + if ($vcs_by_number{ $object->$numbercolumn }) { $entry->{object}->$numbercolumn('####'); } else { @@ -239,7 +241,6 @@ sub setup_displayable_columns { { name => 'payment_id', description => $::locale->text('Payment terms (database ID)') }, { name => 'payment', description => $::locale->text('Payment terms (name)') }, { name => 'phone', description => $::locale->text('Phone') }, - { name => 'pricing_agreement', description => $::locale->text('Pricing agreement') }, { name => 'street', description => $::locale->text('Street') }, { name => 'taxnumber', description => $::locale->text('Tax Number / SSN') }, { name => 'taxzone_id', description => $::locale->text('Steuersatz') },