X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FContact.pm;h=e5dadbbebe50d308f9bccc7c3632507ffa49ba8f;hb=e74dac176e01090f7e3b6bd9e99596a36e614284;hp=04697cb9b7385b2574ce94a8c643d44f077df947;hpb=32115b41fee3d1e1523c60975c8da4641a33f37f;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Contact.pm b/SL/Controller/CsvImport/Contact.pm
index 04697cb9b..e5dadbbeb 100644
--- a/SL/Controller/CsvImport/Contact.pm
+++ b/SL/Controller/CsvImport/Contact.pm
@@ -8,8 +8,7 @@ use parent qw(SL::Controller::CsvImport::Base);
 
 use Rose::Object::MakeMethods::Generic
 (
- scalar                  => [ qw(table) ],
- 'scalar --get_set_init' => [ qw(all_vc) ],
+ scalar => [ qw(table) ],
 );
 
 sub init_class {
@@ -17,61 +16,32 @@ sub init_class {
   $self->class('SL::DB::Contact');
 }
 
-sub init_all_vc {
-  my ($self) = @_;
-
-  $self->all_vc({ customers => SL::DB::Manager::Customer->get_all(with_objects => [ 'contacts' ]),
-                  vendors   => SL::DB::Manager::Vendor->get_all(  with_objects => [ 'contacts' ]) });
-}
-
 sub check_objects {
   my ($self) = @_;
 
-  my %by_id     = map { ( $_->id => $_ ) } @{ $self->all_vc->{customers} }, @{ $self->all_vc->{vendors} };
-  my %by_number = ( customers => { map { ( $_->customernumber => $_->id ) } @{ $self->all_vc->{customers} } },
-                    vendors   => { map { ( $_->vendornumber   => $_->id ) } @{ $self->all_vc->{vendors}   } } );
-  my %by_name   = ( customers => { map { ( $_->name           => $_->id ) } @{ $self->all_vc->{customers} } },
-                    vendors   => { map { ( $_->name           => $_->id ) } @{ $self->all_vc->{vendors}   } } );
-
   foreach my $entry (@{ $self->controller->data }) {
-    my $object   = $entry->{object};
-    my $raw_data = $entry->{raw_data};
-
-    my $name     =  $object->cp_name;
-    $name        =~ s/^\s+//;
-    $name        =~ s/\s+$//;
-
-    if (!$name) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Name missing');
-      next;
-    }
+    $self->check_name($entry);
+    $self->check_vc($entry, 'cp_cv_id');
+    $self->check_gender($entry);
+  }
 
-    if ($object->cp_cv_id) {
-      $object->cp_cv_id(undef) if !$by_id{ $object->cp_cv_id };
-    }
+  $self->add_info_columns({ header => $::locale->text('Customer/Vendor'), method => 'vc_name' });
+}
 
-    if (!$object->cp_cv_id) {
-      my $vc_id = $by_number{customers}->{ $raw_data->{customernumber} } || $by_number{vendors}->{ $raw_data->{vendornumber} };
-      $object->cp_cv_id($vc_id) if $vc_id;
-    }
+sub check_name {
+  my ($self, $entry) = @_;
 
-    if (!$object->cp_cv_id) {
-      my $vc_id = $by_name{customers}->{ $raw_data->{customer} } || $by_name{vendors}->{ $raw_data->{vendor} };
-      $object->cp_cv_id($vc_id) if $vc_id;
-    }
+  my $name     =  $entry->{object}->cp_name;
+  $name        =~ s/^\s+//;
+  $name        =~ s/\s+$//;
 
-    if (!$object->cp_cv_id) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Customer/vendor not found');
-      next;
-    }
+  push @{ $entry->{errors} }, $::locale->text('Error: Name missing') unless $name;
+}
 
-    $entry->{vc} = $by_id{ $object->cp_cv_id };
+sub check_gender {
+  my ($self, $entry) = @_;
 
-    if (($object->cp_gender ne 'm') && ($object->cp_gender ne 'f')) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Gender (cp_gender) missing or invalid');
-      next;
-    }
-  }
+  push @{ $entry->{errors} }, $::locale->text('Error: Gender (cp_gender) missing or invalid') if ($entry->{object}->cp_gender ne 'm') && ($entry->{object}->cp_gender ne 'f');
 }
 
 sub check_duplicates {