X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FCustomerVendor.pm;h=0042533a0c1a5a0743aa28da079d759e03d55cf8;hb=8bf65ceabe6fcc0a80ca940e04a8d5219aa2d3d2;hp=14b67305fba9703cf1937c56c616f1b1d1604f9a;hpb=0f0cb3b708f9078b774a07cecd996e5bdc5fac63;p=kivitendo-erp.git diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm index 14b67305f..0042533a0 100644 --- a/SL/Controller/CsvImport/CustomerVendor.pm +++ b/SL/Controller/CsvImport/CustomerVendor.pm @@ -14,9 +14,14 @@ use parent qw(SL::Controller::CsvImport::Base); use Rose::Object::MakeMethods::Generic ( - 'scalar --get_set_init' => [ qw(table languages_by businesses_by) ], + 'scalar --get_set_init' => [ qw(table languages_by businesses_by salesmen_by) ], ); +sub set_profile_defaults { + my ($self) = @_; + $self->controller->profile->_set_defaults(table => 'customer'); +}; + sub init_table { my ($self) = @_; $self->table($self->controller->profile->get('table') eq 'customer' ? 'customer' : 'vendor'); @@ -45,6 +50,12 @@ sub init_languages_by { return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $self->all_languages } } ) } qw(id description article_code) }; } +sub init_salesmen_by { + my ($self) = @_; + + return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ SL::DB::Manager::Employee->get_all } } ) } qw(id name) }; +} + sub check_objects { my ($self) = @_; @@ -67,13 +78,15 @@ sub check_objects { $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->check_salesman($entry); $self->handle_cvars($entry); next if @{ $entry->{errors} }; - 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)); + my @cleaned_fields = $self->clean_fields(qr{[\r\n]}, $object, qw(name department_1 department_2 street zipcode city country gln 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; @@ -89,7 +102,7 @@ sub check_objects { # Update existing customer/vendor records. $entry->{object_to_save} = $existing_vc; - $existing_vc->$_( $entry->{object}->$_ ) for @{ $methods }; + $existing_vc->$_( $entry->{object}->$_ ) for @{ $methods }, keys %{ $self->clone_methods }; push @{ $entry->{information} }, $::locale->text('Updating existing entry in database'); @@ -100,7 +113,7 @@ sub check_objects { $i++; } - $self->add_columns(map { "${_}_id" } grep { exists $self->controller->data->[0]->{raw_data}->{$_} } qw(language business payment delivery_term)); + $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; } @@ -153,6 +166,9 @@ sub check_language { } $object->language_id($language->id); + + # register language_id for method copying later + $self->clone_methods->{language_id} = 1; } return 1; @@ -179,6 +195,38 @@ sub check_business { } $object->business_id($business->id); + + # register business_id for method copying later + $self->clone_methods->{business_id} = 1; + } + + return 1; +} + +sub check_salesman { + my ($self, $entry) = @_; + + my $object = $entry->{object}; + + # Check whether or not salesman ID is valid. + if ($object->salesman_id && !$self->salesmen_by->{id}->{ $object->salesman_id }) { + push @{ $entry->{errors} }, $::locale->text('Error: Invalid salesman'); + return 0; + } + + # Map name to ID if given. + if (!$object->salesman_id && $entry->{raw_data}->{salesman}) { + my $salesman = $self->salesmen_by->{name}->{ $entry->{raw_data}->{salesman} }; + + if (!$salesman) { + push @{ $entry->{errors} }, $::locale->text('Error: Invalid salesman'); + return 0; + } + + $object->salesman_id($salesman->id); + + # register salesman_id for method copying later + $self->clone_methods->{salesman_id} = 1; } return 1; @@ -208,31 +256,12 @@ 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 delivery_term salesman salesman_id taxincluded terms)}; + delete @{$profile}{qw(business datevexport language payment delivery_term taxincluded terms)}; + delete @{$profile}{qw(salesman salesman_id)} if $::instance_conf->get_vertreter; return $profile; } @@ -267,10 +296,11 @@ sub setup_displayable_columns { { name => 'discount', description => $::locale->text('Discount') }, { name => 'email', description => $::locale->text('E-mail') }, { name => 'fax', description => $::locale->text('Fax') }, + { name => 'gln', description => $::locale->text('GLN') }, { 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 => 'pricegroup_id', description => $::locale->text('Price group (database ID)') }, { name => 'language_id', description => $::locale->text('Language (database ID)') }, { name => 'language', description => $::locale->text('Language (name)') }, { name => 'name', description => $::locale->text('Name') }, @@ -281,12 +311,19 @@ 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') }, { name => 'zipcode', description => $::locale->text('Zipcode') }, ); + + if (!$::instance_conf->get_vertreter) { + $self->add_displayable_columns({ name => 'salesman_id', description => $::locale->text('Salesman (database ID)') }); + $self->add_displayable_columns({ name => 'salesman', description => $::locale->text('Salesman') }); + } + } # TODO: