Hilfetexte für Lieferanschriftenstammdatenimport

diff --git a/SL/Controller/CsvImport/Contact.pm b/SL/Controller/CsvImport/Contact.pm
index 83f8570..04697cb 100644 (file)
--- a/SL/Controller/CsvImport/Contact.pm
+++ b/SL/Controller/CsvImport/Contact.pm
@@ -113,4 +113,35 @@ sub field_lengths {
          );
 }
 
+sub setup_displayable_columns {
+  my ($self) = @_;
+
+  $self->SUPER::setup_displayable_columns;
+
+  $self->add_displayable_columns({ name => 'cp_abteilung',   description => $::locale->text('Department')                    },
+                                 { name => 'cp_birthday',    description => $::locale->text('Birthday')                      },
+                                 { name => 'cp_cv_id',       description => $::locale->text('Customer/Vendor (database ID)') },
+                                 { name => 'cp_email',       description => $::locale->text('E-mail')                        },
+                                 { name => 'cp_fax',         description => $::locale->text('Fax')                           },
+                                 { name => 'cp_gender',      description => $::locale->text('Gender')                        },
+                                 { name => 'cp_givenname',   description => $::locale->text('Given Name')                    },
+                                 { name => 'cp_mobile1',     description => $::locale->text('Mobile1')                       },
+                                 { name => 'cp_mobile2',     description => $::locale->text('Mobile2')                       },
+                                 { name => 'cp_name',        description => $::locale->text('Name')                          },
+                                 { name => 'cp_phone1',      description => $::locale->text('Phone1')                        },
+                                 { name => 'cp_phone2',      description => $::locale->text('Phone2')                        },
+                                 { name => 'cp_privatemail', description => $::locale->text('Private E-mail')                },
+                                 { name => 'cp_privatphone', description => $::locale->text('Private Phone')                 },
+                                 { name => 'cp_project',     description => $::locale->text('Project')                       },
+                                 { name => 'cp_satfax',      description => $::locale->text('Sat. Fax')                      },
+                                 { name => 'cp_satphone',    description => $::locale->text('Sat. Phone')                    },
+                                 { name => 'cp_title',       description => $::locale->text('Title')                         },
+
+                                 { 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;

diff --git a/SL/Controller/CsvImport/Shipto.pm b/SL/Controller/CsvImport/Shipto.pm
index 5f99386..9c6a2e9 100644 (file)
--- a/SL/Controller/CsvImport/Shipto.pm
+++ b/SL/Controller/CsvImport/Shipto.pm
@@ -106,4 +106,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;

diff --git a/locale/de/all b/locale/de/all
index 1dfc3c0..2ee4b97 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -214,6 +214,7 @@ $self->{texts} = {
   'Assume Tax Consultant Data in Tax Computation?' => 'Beraterdaten in UStVA übernehmen?',
   'At least'                    => 'Mindestens',
   'At least one Perl module that Lx-Office ERP requires for running is not installed on your system.' => 'Mindestes ein Perl-Modul, das Lx-Office ERP zur Ausführung benötigt, ist auf Ihrem System nicht installiert.',
+  'At least one of the columns #1, customer, customernumber, vendor, vendornumber (depending on the target table) is required for matching the entry to an existing customer or vendor.' => 'Mindestens eine der Spalten #1, customer, customernumber, vendor, vendornumber (von Zieltabelle abhängig) wird benötigt, um einen Eintrag einem bestehenden Kunden bzw. Lieferanten zuzuordnen.',
   'At most'                     => 'Höchstens',
   'At the moment the transaction looks like this:' => 'Aktuell sieht die Buchung wie folgt aus:',
   'Attach PDF:'                 => 'PDF anhängen',
@@ -478,6 +479,7 @@ $self->{texts} = {
   'Custom Variables'            => 'Benutzerdefinierte Variablen',
   'Custom variables for module' => 'Benutzerdefinierte Variablen für Modul',
   'Customer'                    => 'Kunde',
+  'Customer (name)'             => 'Kunde (Name)',
   'Customer Name'               => 'Kundenname',
   'Customer Number'             => 'Kundennummer',
   'Customer Order Number'       => 'Bestellnummer des Kunden',
@@ -488,6 +490,7 @@ $self->{texts} = {
   'Customer not on file!'       => 'Kunde ist nicht in der Datenbank!',
   'Customer saved!'             => 'Kunde gespeichert!',
   'Customer type'               => 'Kundentyp',
+  'Customer/Vendor (database ID)' => 'Kunde/Lieferant (Datenbank-ID)',
   'Customername'                => 'Kundenname',
   'Customernumberinit'          => 'Kunden-/Lieferantennummernkreis',
   'Customers'                   => 'Kunden',
@@ -1986,6 +1989,7 @@ $self->{texts} = {
   'Variable Description'        => 'Datenfeldbezeichnung',
   'Variable Name'               => 'Datenfeldname (intern)',
   'Vendor'                      => 'Lieferant',
+  'Vendor (name)'               => 'Lieferant (Name)',
   'Vendor Invoice'              => 'Einkaufsrechnung',
   'Vendor Invoices'             => 'Einkaufsrechnungen',
   'Vendor Name'                 => 'Lieferantenname',

diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 1fed864..2f0ff54 100644 (file)
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -69,6 +69,16 @@
      </tr>
     [%- END %]
    </table>
+
+[%- IF SELF.type == 'contacts' %]
+   <p>
+    [%- LxERP.t8('At least one of the columns #1, customer, customernumber, vendor, vendornumber (depending on the target table) is required for matching the entry to an existing customer or vendor.', 'cp_cv_id') %]
+   </p>
+[%- ELSIF SELF.type == 'addresses' %]
+   <p>
+    [%- LxERP.t8('At least one of the columns #1, customer, customernumber, vendor, vendornumber (depending on the target table) is required for matching the entry to an existing customer or vendor.', 'trans_id') %]
+   </p>
+[%- END %]
   </div>
 
   <hr>