X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FCustomerVendor.pm;h=0a5c121b6bd6e4759554ac2c8985f62076304b3e;hb=d402ad9bc8991a0631206930c9c5b238e5586931;hp=41234bfee199c29ff2ea22b3e9f886be46294090;hpb=280cbfe97461e08c8dbc604dd487b08b79ffd8ed;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm index 41234bfee..0a5c121b6 100644 --- a/SL/Controller/CsvImport/CustomerVendor.pm +++ b/SL/Controller/CsvImport/CustomerVendor.pm @@ -3,6 +3,7 @@ package SL::Controller::CsvImport::CustomerVendor; use strict; use SL::Helper::Csv; +use SL::Controller::CsvImport::Helper::Consistency; use SL::DB::Business; use SL::DB::CustomVariable; use SL::DB::CustomVariableConfig; @@ -47,28 +48,60 @@ sub init_languages_by { sub check_objects { my ($self) = @_; - my $numbercolumn = $self->controller->profile->get('table') . "number"; - my %vcs_by_number = map { ( $_->$numbercolumn => 1 ) } @{ $self->existing_objects }; + $self->controller->track_progress(phase => 'building data', progress => 0); + my $vc = $self->controller->profile->get('table'); + my $update_policy = $self->controller->profile->get('update_policy') || 'update_existing'; + my $numbercolumn = "${vc}number"; + my %vcs_by_number = map { ( $_->$numbercolumn => $_ ) } @{ $self->existing_objects }; + my $methods = $self->controller->headers->{methods}; + + my $i; + 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; my $object = $entry->{object}; $self->check_name($entry); $self->check_language($entry); $self->check_business($entry); $self->check_payment($entry); + $self->check_delivery_term($entry); + $self->check_taxzone($entry, take_default => 1); + $self->check_currency($entry, take_default => 1); $self->handle_cvars($entry); next if @{ $entry->{errors} }; - if ($vcs_by_number{ $object->$numbercolumn }) { - $entry->{object}->$numbercolumn('####'); + my @cleaned_fields = $self->clean_fields(qr{[\r\n]}, $object, qw(name department_1 department_2 street zipcode city country contact phone fax homepage email cc bcc + taxnumber account_number bank_code bank username greeting taxzone)); + + 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 }; + if (!$existing_vc) { + $vcs_by_number{ $object->$numbercolumn } = $object if $object->$numbercolumn; + + } elsif ($update_policy eq 'skip') { + push(@{$entry->{errors}}, $::locale->text('Skipping due to existing entry in database')); + + } elsif ($update_policy eq 'update_existing') { + # Update existing customer/vendor records. + $entry->{object_to_save} = $existing_vc; + + $existing_vc->$_( $entry->{object}->$_ ) for @{ $methods }, keys %{ $self->clone_methods }; + + push @{ $entry->{information} }, $::locale->text('Updating existing entry in database'); + } else { - $vcs_by_number{ $object->$numbercolumn } = $object; + $object->$numbercolumn('####'); } + } continue { + $i++; } - $self->add_columns(map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(language business payment)); + $self->add_columns(map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(language business payment delivery_term taxzone)); $self->add_cvar_raw_data_columns; } @@ -121,6 +154,9 @@ sub check_language { } $object->language_id($language->id); + + # register language_id for method copying later + $self->clone_methods->{language_id} = 1; } return 1; @@ -132,7 +168,7 @@ sub check_business { my $object = $entry->{object}; # Check whether or not business ID is valid. - if ($object->business_id && !$self->businesss_by->{id}->{ $object->business_id }) { + if ($object->business_id && !$self->businesses_by->{id}->{ $object->business_id }) { push @{ $entry->{errors} }, $::locale->text('Error: Invalid business'); return 0; } @@ -147,6 +183,9 @@ sub check_business { } $object->business_id($business->id); + + # register business_id for method copying later + $self->clone_methods->{business_id} = 1; } return 1; @@ -176,31 +215,11 @@ sub save_objects { $self->SUPER::save_objects(data => $without_number); } -sub field_lengths { - return ( name => 75, - department_1 => 75, - department_2 => 75, - street => 75, - zipcode => 10, - city => 75, - country => 75, - contact => 75, - fax => 30, - account_number => 15, - bank_code => 10, - language => 5, - username => 50, - ustid => 14, - iban => 100, - bic => 100, - ); -} - sub init_profile { my ($self) = @_; my $profile = $self->SUPER::init_profile; - delete @{$profile}{qw(business datevexport language payment salesman salesman_id taxincluded terms)}; + delete @{$profile}{qw(business datevexport language payment delivery_term salesman salesman_id taxincluded terms)}; return $profile; } @@ -224,9 +243,13 @@ sub setup_displayable_columns { { name => 'contact', description => $::locale->text('Contact') }, { name => 'country', description => $::locale->text('Country') }, { name => 'creditlimit', description => $::locale->text('Credit Limit') }, + { name => 'currency', description => $::locale->text('Currency') }, + { name => 'currency_id', description => $::locale->text('Currency (database ID)') }, { name => 'customernumber', description => $::locale->text('Customer Number') }, { name => 'department_1', description => $::locale->text('Department 1') }, { name => 'department_2', description => $::locale->text('Department 2') }, + { name => 'delivery_term_id', description => $::locale->text('Delivery terms (database ID)') }, + { name => 'delivery_term', description => $::locale->text('Delivery terms (name)') }, { name => 'direct_debit', description => $::locale->text('direct debit') }, { name => 'discount', description => $::locale->text('Discount') }, { name => 'email', description => $::locale->text('E-mail') }, @@ -245,7 +268,8 @@ sub setup_displayable_columns { { name => 'phone', description => $::locale->text('Phone') }, { name => 'street', description => $::locale->text('Street') }, { name => 'taxnumber', description => $::locale->text('Tax Number / SSN') }, - { name => 'taxzone_id', description => $::locale->text('Steuersatz') }, + { name => 'taxzone', description => $::locale->text('Tax zone (description)') }, + { name => 'taxzone_id', description => $::locale->text('Tax zone (database ID)') }, { name => 'user_password', description => $::locale->text('Password') }, { name => 'username', description => $::locale->text('Username') }, { name => 'ustid', description => $::locale->text('sales tax identification number') }, @@ -256,4 +280,4 @@ sub setup_displayable_columns { # TODO: # salesman_id -- Kunden mit Typ 'Verkäufer', falls Vertreter-Modus an ist, ansonsten Employees -1; \ No newline at end of file +1;