X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=templates%2Fwebpages%2Fcsv_import%2Fform.html;h=9fd30ac1d953bc09272b571b805ff64c16215239;hb=6c5cdbebb76503232d7aabafd7c86e353ef2b73d;hp=c14fba79337739d0dc0245b725e6cf3a9c6501f9;hpb=8b8f7572de2c9f0a05fecf4ecf7881f15d96af64;p=kivitendo-erp.git
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index c14fba793..9fd30ac1d 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -73,6 +73,7 @@
[%- IF SELF.type == 'contacts' %]
+ [%- LxERP.t8("You can update existing contacts by providing the 'cp_id' column with their database IDs. Otherwise: ") %]
[%- 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') %]
@@ -106,6 +107,13 @@
[%- LxERP.t8('Settings') %]
+
+
+
+
[% LxERP.t8("Hide settings") %]
+
[%- LxERP.t8('Number Format') %]: |
@@ -196,6 +204,8 @@
[%- INCLUDE 'csv_import/_form_parts.html' %]
[%- ELSIF SELF.type == 'customers_vendors' %]
[%- INCLUDE 'csv_import/_form_customers_vendors.html' %]
+[%- ELSIF SELF.type == 'contacts' %]
+ [%- INCLUDE 'csv_import/_form_contacts.html' %]
[%- END %]
@@ -221,27 +231,28 @@
+
+
+
[% 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 %]
+ [% L.submit_tag('action_import', LxERP.t8('Import'), style='display:none') %]
- [%- IF SELF.import_status %]
- [%- IF SELF.errors %]
- [%- PROCESS 'csv_import/_errors.html' %]
- [%- END %]
-
- [%- PROCESS 'csv_import/_result.html' %]
- [%- PROCESS 'csv_import/_preview.html' %]
+
+ [%- IF SELF.deferred %]
+ [%- PROCESS 'csv_import/_deferred_results.html' %]
+ [%- ELSIF SELF.import_status %]
+ [%- PROCESS 'csv_import/_results.html' %]
[%- END %]
+
+