From 8a3a4a40b43a0556ca7d72fd0fa72e45a8ccb385 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Fri, 12 Feb 2016 16:47:50 +0100 Subject: [PATCH] GLN: CsvImport Kunden u. Lieferanten und Lieferadressen. --- SL/Controller/CsvImport/CustomerVendor.pm | 3 ++- SL/Controller/CsvImport/Shipto.pm | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/SL/Controller/CsvImport/CustomerVendor.pm b/SL/Controller/CsvImport/CustomerVendor.pm index 4f7872164..d1e026d42 100644 --- a/SL/Controller/CsvImport/CustomerVendor.pm +++ b/SL/Controller/CsvImport/CustomerVendor.pm @@ -85,7 +85,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)) @@ -296,6 +296,7 @@ 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') }, diff --git a/SL/Controller/CsvImport/Shipto.pm b/SL/Controller/CsvImport/Shipto.pm index e32da468b..6c01a1426 100644 --- a/SL/Controller/CsvImport/Shipto.pm +++ b/SL/Controller/CsvImport/Shipto.pm @@ -112,6 +112,7 @@ sub setup_displayable_columns { { name => 'shiptodepartment_2', description => $::locale->text('Department 2') }, { name => 'shiptoemail', description => $::locale->text('E-mail') }, { name => 'shiptofax', description => $::locale->text('Fax') }, + { name => 'shiptogln', description => $::locale->text('GLN') }, { name => 'shiptoname', description => $::locale->text('Name') }, { name => 'shiptophone', description => $::locale->text('Phone') }, { name => 'shiptostreet', description => $::locale->text('Street') }, -- 2.20.1