X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FCsvImport%2FCustomerVendor.pm;h=0042533a0c1a5a0743aa28da079d759e03d55cf8;hb=4825c38f5775010136ae10a147dbb9bdc1194f16;hp=b70c0a7b38134095f8feb54894fc8b4f0474063d;hpb=3624b119556731da41e4ad395491ebb067f26565;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm
index b70c0a7b3..0042533a0 100644
--- a/SL/Controller/CsvImport/CustomerVendor.pm
+++ b/SL/Controller/CsvImport/CustomerVendor.pm
@@ -14,7 +14,7 @@ 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 {
@@ -50,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) = @_;
 
@@ -74,11 +80,12 @@ sub check_objects {
     $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
+    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))
@@ -196,6 +203,35 @@ sub check_business {
   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;
+}
+
 sub save_objects {
   my ($self, %params) = @_;
 
@@ -224,7 +260,8 @@ 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;
 }
@@ -259,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')                            },
@@ -280,6 +318,12 @@ sub setup_displayable_columns {
                                  { 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: