X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FCustomerVendor.pm;h=41234bfee199c29ff2ea22b3e9f886be46294090;hb=00302856e8e4f1505a2315d24c9779b082d180db;hp=9cb115745cdee2eb35c8f07f2efa2973ab9fc649;hpb=0297cac9a9ee9ada4fa4fd70123a24e0fa13aac9;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm index 9cb115745..41234bfee 100644 --- a/SL/Controller/CsvImport/CustomerVendor.pm +++ b/SL/Controller/CsvImport/CustomerVendor.pm @@ -3,12 +3,17 @@ package SL::Controller::CsvImport::CustomerVendor; use strict; use SL::Helper::Csv; +use SL::DB::Business; +use SL::DB::CustomVariable; +use SL::DB::CustomVariableConfig; +use SL::DB::PaymentTerm; +use SL::TransNumber; use parent qw(SL::Controller::CsvImport::Base); use Rose::Object::MakeMethods::Generic ( - 'scalar --get_set_init' => [ qw(table) ], + 'scalar --get_set_init' => [ qw(table languages_by businesses_by) ], ); sub init_table { @@ -21,6 +26,24 @@ sub init_class { $self->class('SL::DB::' . ucfirst($self->table)); } +sub init_all_cvar_configs { + my ($self) = @_; + + return SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'CT' ]); +} + +sub init_businesses_by { + my ($self) = @_; + + return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ SL::DB::Manager::Business->get_all } } ) } qw(id description) }; +} + +sub init_languages_by { + my ($self) = @_; + + return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $self->all_languages } } ) } qw(id description article_code) }; +} + sub check_objects { my ($self) = @_; @@ -30,13 +53,13 @@ sub check_objects { foreach my $entry (@{ $self->controller->data }) { my $object = $entry->{object}; - my $name = $object->name; - $name =~ s/^\s+//; - $name =~ s/\s+$//; - if (!$name) { - push @{ $entry->{errors} }, $::locale->text('Error: Name missing'); - next; - } + $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('####'); @@ -44,29 +67,89 @@ sub check_objects { $vcs_by_number{ $object->$numbercolumn } = $object; } } + + $self->add_columns(map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(language business payment)); + $self->add_cvar_raw_data_columns; } -sub check_duplicates { - my ($self, %params) = @_; +sub get_duplicate_check_fields { + return { + name => { + label => $::locale->text('Customer Name'), + default => 1, + maker => sub { + my $name = shift->name; + $name =~ s/[\s,\.\-]//g; + return $name; + } + }, + }; +} + +sub check_name { + my ($self, $entry) = @_; + + my $name = $entry->{object}->name; + $name =~ s/^\s+//; + $name =~ s/\s+$//; + + return 1 if $name; - my $normalizer = sub { my $name = $_[0]; $name =~ s/[\s,\.\-]//g; return $name; }; + push @{ $entry->{errors} }, $::locale->text('Error: Name missing'); + return 0; +} + +sub check_language { + my ($self, $entry) = @_; - my %by_name; - if ('check_db' eq $self->controller->profile->get('duplicates')) { - %by_name = map { ( $normalizer->($_->name) => 'db' ) } @{ $self->existing_objects }; + my $object = $entry->{object}; + + # Check whether or not language ID is valid. + if ($object->language_id && !$self->languages_by->{id}->{ $object->language_id }) { + push @{ $entry->{errors} }, $::locale->text('Error: Invalid language'); + return 0; } - foreach my $entry (@{ $self->controller->data }) { - next if @{ $entry->{errors} }; + # Map name to ID if given. + if (!$object->language_id && $entry->{raw_data}->{language}) { + my $language = $self->languages_by->{description}->{ $entry->{raw_data}->{language} } + || $self->languages_by->{article_code}->{ $entry->{raw_data}->{language} }; - my $name = $normalizer->($entry->{object}->name); - if (!$by_name{$name}) { - $by_name{$name} = 'csv'; + if (!$language) { + push @{ $entry->{errors} }, $::locale->text('Error: Invalid language'); + return 0; + } - } else { - push @{ $entry->{errors} }, $by_name{$name} eq 'db' ? $::locale->text('Duplicate in database') : $::locale->text('Duplicate in CSV file'); + $object->language_id($language->id); + } + + return 1; +} + +sub check_business { + my ($self, $entry) = @_; + + my $object = $entry->{object}; + + # Check whether or not business ID is valid. + if ($object->business_id && !$self->businesss_by->{id}->{ $object->business_id }) { + push @{ $entry->{errors} }, $::locale->text('Error: Invalid business'); + return 0; + } + + # Map name to ID if given. + if (!$object->business_id && $entry->{raw_data}->{business}) { + my $business = $self->businesses_by->{description}->{ $entry->{raw_data}->{business} }; + + if (!$business) { + push @{ $entry->{errors} }, $::locale->text('Error: Invalid business'); + return 0; } + + $object->business_id($business->id); } + + return 1; } sub save_objects { @@ -76,7 +159,18 @@ sub save_objects { my $with_number = [ grep { $_->{object}->$numbercolumn ne '####' } @{ $self->controller->data } ]; my $without_number = [ grep { $_->{object}->$numbercolumn eq '####' } @{ $self->controller->data } ]; - map { $_->{object}->$numbercolumn('') } @{ $without_number }; + foreach my $entry (@{$with_number}, @{$without_number}) { + my $object = $entry->{object}; + + my $number = SL::TransNumber->new(type => $self->table(), + number => $object->$numbercolumn(), + business_id => $object->business_id(), + save => 1); + + if ( $object->$numbercolumn eq '####' || !$number->is_unique() ) { + $object->$numbercolumn($number->create_unique()); + } + } $self->SUPER::save_objects(data => $with_number); $self->SUPER::save_objects(data => $without_number); @@ -91,7 +185,6 @@ sub field_lengths { city => 75, country => 75, contact => 75, - phone => 30, fax => 30, account_number => 15, bank_code => 10, @@ -103,4 +196,64 @@ sub field_lengths { ); } -1; +sub init_profile { + my ($self) = @_; + + my $profile = $self->SUPER::init_profile; + delete @{$profile}{qw(business datevexport language payment salesman salesman_id taxincluded terms)}; + + return $profile; +} + +sub setup_displayable_columns { + my ($self) = @_; + + $self->SUPER::setup_displayable_columns; + $self->add_cvar_columns_to_displayable_columns; + + $self->add_displayable_columns({ name => 'account_number', description => $::locale->text('Account Number') }, + { name => 'bank', description => $::locale->text('Bank') }, + { name => 'bank_code', description => $::locale->text('Bank Code') }, + { name => 'bcc', description => $::locale->text('Bcc') }, + { name => 'bic', description => $::locale->text('BIC') }, + { name => 'business_id', description => $::locale->text('Business type (database ID)') }, + { name => 'business', description => $::locale->text('Business type (name)') }, + { name => 'c_vendor_id', description => $::locale->text('our vendor number at customer') }, + { name => 'cc', description => $::locale->text('Cc') }, + { name => 'city', description => $::locale->text('City') }, + { name => 'contact', description => $::locale->text('Contact') }, + { name => 'country', description => $::locale->text('Country') }, + { name => 'creditlimit', description => $::locale->text('Credit Limit') }, + { name => 'customernumber', description => $::locale->text('Customer Number') }, + { name => 'department_1', description => $::locale->text('Department 1') }, + { name => 'department_2', description => $::locale->text('Department 2') }, + { name => 'direct_debit', description => $::locale->text('direct debit') }, + { name => 'discount', description => $::locale->text('Discount') }, + { name => 'email', description => $::locale->text('E-mail') }, + { name => 'fax', description => $::locale->text('Fax') }, + { name => 'greeting', description => $::locale->text('Greeting') }, + { name => 'homepage', description => $::locale->text('Homepage') }, + { name => 'iban', description => $::locale->text('IBAN') }, + { name => 'klass', description => $::locale->text('Preisklasse') }, + { name => 'language_id', description => $::locale->text('Language (database ID)') }, + { name => 'language', description => $::locale->text('Language (name)') }, + { name => 'name', description => $::locale->text('Name') }, + { name => 'notes', description => $::locale->text('Notes') }, + { name => 'obsolete', description => $::locale->text('Obsolete') }, + { 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 => 'street', description => $::locale->text('Street') }, + { name => 'taxnumber', description => $::locale->text('Tax Number / SSN') }, + { name => 'taxzone_id', description => $::locale->text('Steuersatz') }, + { name => 'user_password', description => $::locale->text('Password') }, + { name => 'username', description => $::locale->text('Username') }, + { name => 'ustid', description => $::locale->text('sales tax identification number') }, + { name => 'zipcode', description => $::locale->text('Zipcode') }, + ); +} + +# TODO: +# salesman_id -- Kunden mit Typ 'Verkäufer', falls Vertreter-Modus an ist, ansonsten Employees + +1; \ No newline at end of file