X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FCustomerVendor.pm;h=0f2b5294dc00994407e3bb77543779f081f99f67;hb=826d79929635c726f7459296fafa7e630c00e72d;hp=4f7872164176b3f9cd3f8af138b8f5544cebc8cc;hpb=d13c70502afaee0fec445b82a0e1db1e37d0dfd2;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm
index 4f7872164..0f2b5294d 100644
--- a/SL/Controller/CsvImport/CustomerVendor.pm
+++ b/SL/Controller/CsvImport/CustomerVendor.pm
@@ -7,6 +7,7 @@ use SL::Controller::CsvImport::Helper::Consistency;
 use SL::DB::Business;
 use SL::DB::CustomVariable;
 use SL::DB::CustomVariableConfig;
+use SL::DB::Employee;
 use SL::DB::PaymentTerm;
 use SL::TransNumber;
 
@@ -53,7 +54,7 @@ sub init_languages_by {
 sub init_salesmen_by {
   my ($self) = @_;
 
-  return { map { my $col = $_; ( $col => { map { ( $_->$col => $_ ) } @{ SL::DB::Manager::Employee->get_all } } ) } qw(id name) };
+  return { map { my $col = $_; ( $col => { map { ( lc($_->$col) => $_ ) } @{ SL::DB::Manager::Employee->get_all } } ) } qw(id name login) };
 }
 
 sub check_objects {
@@ -85,7 +86,7 @@ sub check_objects {
 
     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))
@@ -104,6 +105,9 @@ sub check_objects {
 
       $existing_vc->$_( $entry->{object}->$_ ) for @{ $methods }, keys %{ $self->clone_methods };
 
+      $self->handle_cvars($entry);
+      $existing_vc->custom_variables($entry->{object}->custom_variables);
+
       push @{ $entry->{information} }, $::locale->text('Updating existing entry in database');
 
     } else {
@@ -215,8 +219,9 @@ sub check_salesman {
   }
 
   # 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 (!$object->salesman_id && ($entry->{raw_data}->{salesman} || $entry->{raw_data}->{salesman_login})) {
+    my $salesman = $self->salesmen_by->{name} ->{ lc($entry->{raw_data}->{salesman}) }
+                // $self->salesmen_by->{login}->{ lc($entry->{raw_data}->{salesman_login}) };
 
     if (!$salesman) {
       push @{ $entry->{errors} }, $::locale->text('Error: Invalid salesman');
@@ -261,7 +266,7 @@ sub init_profile {
 
   my $profile = $self->SUPER::init_profile;
   delete @{$profile}{qw(business datevexport language payment delivery_term taxincluded terms)};
-  delete @{$profile}{qw(salesman salesman_id)}    if $::instance_conf->get_vertreter;
+  delete @{$profile}{qw(salesman salesman_id salesman_login)} if $::instance_conf->get_vertreter;
 
   return $profile;
 }
@@ -296,10 +301,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')                            },
@@ -319,10 +325,10 @@ sub setup_displayable_columns {
                                 );
 
   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') });
+    $self->add_displayable_columns({ name => 'salesman',       description => $::locale->text('Salesman') },
+                                   { name => 'salesman_id',    description => $::locale->text('Salesman (database ID)') },
+                                   { name => 'salesman_login', description => $::locale->text('Salesman (login)') });
   }
-
 }
 
 # TODO: