X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcsv_import%2Fform.html;h=b146465a8bbba692c061b74106c9aa65218d35a9;hb=954b24d2ef8c7f72da0af3637035c83f8ebdfc0d;hp=56e307255d9351cb4c97b1158b8805cddbf4c96c;hpb=29269e9981bc1fd95b32052790688e83a01204df;p=kivitendo-erp.git
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 56e307255..b146465a8 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -45,11 +45,59 @@
+
[% LxERP.t8("Hide help text") %]
+
+
+
+ [%- LxERP.t8('Column name') %] |
+ [%- LxERP.t8('Meaning') %] |
+
+
+ [%- FOREACH row = SELF.displayable_columns %]
+
+ [%- HTML.escape(row.name) %] |
+ [%- HTML.escape(row.description) %] |
+
+ [%- END %]
+
+
+[%- IF SELF.type == 'contacts' %]
+
+ [%- 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') %]
+
+
+[%- ELSIF SELF.type == 'addresses' %]
+
+ [%- 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') %]
+
+
+[%- ELSIF SELF.type == 'parts' %]
+
+ [%- LxERP.t8("If the article type is set to 'mixed' then a column called 'type' must be present.") %]
+ [% LxERP.t8("Type can be either 'part' or 'service'.") %]
+
+[%- END %]
+
+
+ [%- L.submit_tag('action_download_sample', LxERP.t8('Download sample file')) %]
+
+
+
+
+
- [%- LxERP.t8('Number format') %]: |
+ [%- LxERP.t8('Number Format') %]: |
[% SET options = L.options_for_select([ '1.000,00', '1000,00', '1,000.00', '1000.00' ], default => SELF.profile.get('numberformat')) %]
[% L.select_tag('settings.numberformat', options, style => 'width: 300px') %]
@@ -112,9 +160,9 @@
|
[%- LxERP.t8('Check for duplicates') %]: |
- [% opts = [ [ 'no_check', LxERP.t8('Do not check for duplicates') ],
+ [% opts = [ [ 'no_check', LxERP.t8('Do not check for duplicates') ],
[ 'check_csv', LxERP.t8('Discard duplicate entries in CSV file') ],
- [ 'check_db', LxERP.t8('Discard entries with duplicates in database and CSV file') ] ] %]
+ [ 'check_db', LxERP.t8('Discard entries with duplicates in database or CSV file') ] ] %]
[% L.select_tag('settings.duplicates', L.options_for_select(opts, default => SELF.profile.get('duplicates')), style => 'width: 300px') %]
|
@@ -139,10 +187,22 @@
- [% L.submit_tag('action_test', LxERP.t8('Gogogo')) %]
+ [% L.submit_tag('action_test', LxERP.t8('Test and preview')) %]
+ [% IF (SELF.import_status == 'tested') && SELF.num_importable %]
+ [% L.submit_tag('action_import', LxERP.t8('Import')) %]
+ [%- END %]
+ [%- IF SELF.import_status %]
+ [%- IF SELF.errors %]
+ [%- PROCESS 'csv_import/_errors.html' %]
+ [%- END %]
+
+ [%- PROCESS 'csv_import/_result.html' %]
+ [%- PROCESS 'csv_import/_preview.html' %]
+ [%- END %]
+