X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FCustomerVendor.pm;h=c0d9ca288a4b25f996c2318cbe9becad16498775;hb=e74dac176e01090f7e3b6bd9e99596a36e614284;hp=5fe15af6e6ce5fae39ca61458b6d82724bd3a167;hpb=f87763cd84d89aafc4c4110ba42d041b02ce4371;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm
index 5fe15af6e..c0d9ca288 100644
--- a/SL/Controller/CsvImport/CustomerVendor.pm
+++ b/SL/Controller/CsvImport/CustomerVendor.pm
@@ -3,21 +3,44 @@ 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 parent qw(SL::Controller::CsvImport::Base);
 
 use Rose::Object::MakeMethods::Generic
 (
- scalar => [ qw(table) ],
+ 'scalar --get_set_init' => [ qw(table languages_by businesses_by) ],
 );
 
-sub run {
+sub init_table {
   my ($self) = @_;
-
   $self->table($self->controller->profile->get('table') eq 'customer' ? 'customer' : 'vendor');
+}
+
+sub init_class {
+  my ($self) = @_;
   $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) = @_;
 
-  $self->SUPER::run;
+  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ $self->all_languages } } ) } qw(id description article_code) };
 }
 
 sub check_objects {
@@ -29,13 +52,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('####');
@@ -43,6 +66,9 @@ 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 {
@@ -52,7 +78,7 @@ sub check_duplicates {
 
   my %by_name;
   if ('check_db' eq $self->controller->profile->get('duplicates')) {
-    %by_name = map { ( $normalizer->($_->name) => 1 ) } @{ $self->existing_objects };
+    %by_name = map { ( $normalizer->($_->name) => 'db' ) } @{ $self->existing_objects };
   }
 
   foreach my $entry (@{ $self->controller->data }) {
@@ -60,14 +86,80 @@ sub check_duplicates {
 
     my $name = $normalizer->($entry->{object}->name);
     if (!$by_name{$name}) {
-      $by_name{$name} = 1;
+      $by_name{$name} = 'csv';
 
     } else {
-      push @{ $entry->{errors} }, $::locale->text('Duplicate');
+      push @{ $entry->{errors} }, $by_name{$name} eq 'db' ? $::locale->text('Duplicate in database') : $::locale->text('Duplicate in CSV file');
     }
   }
 }
 
+sub check_name {
+  my ($self, $entry) = @_;
+
+  my $name =  $entry->{object}->name;
+  $name    =~ s/^\s+//;
+  $name    =~ s/\s+$//;
+
+  return 1 if $name;
+
+  push @{ $entry->{errors} }, $::locale->text('Error: Name missing');
+  return 0;
+}
+
+sub check_language {
+  my ($self, $entry) = @_;
+
+  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;
+  }
+
+  # 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} };
+
+    if (!$language) {
+      push @{ $entry->{errors} }, $::locale->text('Error: Invalid language');
+      return 0;
+    }
+
+    $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 {
   my ($self, %params) = @_;
 
@@ -81,4 +173,85 @@ 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,
+           phone          => 30,
+           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)};
+
+  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;