Entfernen der Spalte datevexport in Tabelle vendor und customer.

[kivitendo-erp.git] / SL / Controller / CsvImport / Shipto.pm

diff --git a/SL/Controller/CsvImport/Shipto.pm b/SL/Controller/CsvImport/Shipto.pm
index 5f99386..f46c09d 100644 (file)
--- a/SL/Controller/CsvImport/Shipto.pm
+++ b/SL/Controller/CsvImport/Shipto.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,49 +16,15 @@ sub init_class {
   $self->class('SL::DB::Shipto');
 }
 
-sub init_all_vc {
-  my ($self) = @_;
-
-  $self->all_vc({ customers => SL::DB::Manager::Customer->get_all,
-                  vendors   => SL::DB::Manager::Vendor->get_all });
-}
-
 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};
-
-    if ($object->trans_id) {
-      $object->trans_id(undef) if !$by_id{ $object->trans_id };
-    }
-
-    if (!$object->trans_id) {
-      my $vc_id = $by_number{customers}->{ $raw_data->{customernumber} } || $by_number{vendors}->{ $raw_data->{vendornumber} };
-      $object->trans_id($vc_id) if $vc_id;
-    }
-
-    if (!$object->trans_id) {
-      my $vc_id = $by_name{customers}->{ $raw_data->{customer} } || $by_name{vendors}->{ $raw_data->{vendor} };
-      $object->trans_id($vc_id) if $vc_id;
-    }
-
-    if (!$object->trans_id) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Customer/vendor not found');
-      next;
-    }
-
-    $object->module('CT');
-
-    $entry->{vc} = $by_id{ $object->trans_id };
+    $self->check_vc($entry, 'trans_id');
+    $entry->{object}->module('CT');
   }
+
+  $self->add_info_columns({ header => $::locale->text('Customer/Vendor'), method => 'vc_name' });
 }
 
 sub check_duplicates {
@@ -106,4 +71,37 @@ sub field_lengths {
          );
 }
 
+sub init_profile {
+  my ($self) = @_;
+
+  my $profile = $self->SUPER::init_profile;
+  delete @{$profile}{qw(module)};
+
+  return $profile;
+}
+
+sub setup_displayable_columns {
+  my ($self) = @_;
+
+  $self->SUPER::setup_displayable_columns;
+
+  $self->add_displayable_columns({ name => 'shiptocity',         description => $::locale->text('City')                          },
+                                 { name => 'shiptocontact',      description => $::locale->text('Contact')                       },
+                                 { name => 'shiptocountry',      description => $::locale->text('Country')                       },
+                                 { name => 'shiptodepartment_1', description => $::locale->text('Department 1')                  },
+                                 { name => 'shiptodepartment_2', description => $::locale->text('Department 2')                  },
+                                 { name => 'shiptoemail',        description => $::locale->text('E-mail')                        },
+                                 { name => 'shiptofax',          description => $::locale->text('Fax')                           },
+                                 { name => 'shiptoname',         description => $::locale->text('Name')                          },
+                                 { name => 'shiptophone',        description => $::locale->text('Phone')                         },
+                                 { name => 'shiptostreet',       description => $::locale->text('Street')                        },
+                                 { name => 'shiptozipcode',      description => $::locale->text('Zipcode')                       },
+                                 { name => 'trans_id',           description => $::locale->text('Customer/Vendor (database ID)') },
+                                 { name => 'customer',           description => $::locale->text('Customer (name)')               },
+                                 { name => 'customernumber',     description => $::locale->text('Customer Number')               },
+                                 { name => 'vendor',             description => $::locale->text('Vendor (name)')                 },
+                                 { name => 'vendornumber',       description => $::locale->text('Vendor Number')                 },
+                                );
+}
+
 1;