X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FCustomerVendor.pm;h=41234bfee199c29ff2ea22b3e9f886be46294090;hb=00302856e8e4f1505a2315d24c9779b082d180db;hp=df36d1d9d1692704886bb26010d2792dc6885bcd;hpb=7caf72fffe2dfe58d11da0acd0e2892e6737330a;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm
index df36d1d9d..41234bfee 100644
--- a/SL/Controller/CsvImport/CustomerVendor.pm
+++ b/SL/Controller/CsvImport/CustomerVendor.pm
@@ -7,6 +7,7 @@ use SL::DB::Business;
 use SL::DB::CustomVariable;
 use SL::DB::CustomVariableConfig;
 use SL::DB::PaymentTerm;
+use SL::TransNumber;
 
 use parent qw(SL::Controller::CsvImport::Base);
 
@@ -52,12 +53,14 @@ sub check_objects {
   foreach my $entry (@{ $self->controller->data }) {
     my $object = $entry->{object};
 
-    next unless $self->check_name($entry);
-    next unless $self->check_language($entry);
-    next unless $self->check_business($entry);
-    next unless $self->check_payment($entry);
+    $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('####');
     } else {
@@ -69,27 +72,18 @@ sub check_objects {
   $self->add_cvar_raw_data_columns;
 }
 
-sub check_duplicates {
-  my ($self, %params) = @_;
-
-  my $normalizer = sub { my $name = $_[0]; $name =~ s/[\s,\.\-]//g; return $name; };
-
-  my %by_name;
-  if ('check_db' eq $self->controller->profile->get('duplicates')) {
-    %by_name = map { ( $normalizer->($_->name) => 'db' ) } @{ $self->existing_objects };
-  }
-
-  foreach my $entry (@{ $self->controller->data }) {
-    next if @{ $entry->{errors} };
-
-    my $name = $normalizer->($entry->{object}->name);
-    if (!$by_name{$name}) {
-      $by_name{$name} = 'csv';
-
-    } else {
-      push @{ $entry->{errors} }, $by_name{$name} eq 'db' ? $::locale->text('Duplicate in database') : $::locale->text('Duplicate in CSV file');
-    }
-  }
+sub get_duplicate_check_fields {
+  return {
+    name => {
+      label     => $::locale->text('Customer Name'),
+      default   => 1,
+      maker     => sub {
+        my $name = shift->name;
+        $name =~ s/[\s,\.\-]//g;
+        return $name;
+      }
+    },
+  };
 }
 
 sub check_name {
@@ -165,7 +159,18 @@ sub save_objects {
   my $with_number    = [ grep { $_->{object}->$numbercolumn ne '####' } @{ $self->controller->data } ];
   my $without_number = [ grep { $_->{object}->$numbercolumn eq '####' } @{ $self->controller->data } ];
 
-  map { $_->{object}->$numbercolumn('') } @{ $without_number };
+  foreach my $entry (@{$with_number}, @{$without_number}) {
+    my $object = $entry->{object};
+
+    my $number = SL::TransNumber->new(type        => $self->table(),
+                                      number      => $object->$numbercolumn(),
+                                      business_id => $object->business_id(),
+                                      save        => 1);
+
+    if ( $object->$numbercolumn eq '####' || !$number->is_unique() ) {
+      $object->$numbercolumn($number->create_unique());
+    }
+  }
 
   $self->SUPER::save_objects(data => $with_number);
   $self->SUPER::save_objects(data => $without_number);
@@ -180,7 +185,6 @@ sub field_lengths {
            city           => 75,
            country        => 75,
            contact        => 75,
-           phone          => 30,
            fax            => 30,
            account_number => 15,
            bank_code      => 10,
@@ -196,7 +200,7 @@ sub init_profile {
   my ($self) = @_;
 
   my $profile = $self->SUPER::init_profile;
-  delete @{$profile}{qw(language business salesman payment)};
+  delete @{$profile}{qw(business datevexport language payment salesman salesman_id taxincluded terms)};
 
   return $profile;
 }
@@ -206,9 +210,50 @@ sub setup_displayable_columns {
 
   $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 an ist, ansonsten Employees
+# salesman_id -- Kunden mit Typ 'Verkäufer', falls Vertreter-Modus an ist, ansonsten Employees
 
-1;
+1;
\ No newline at end of file