X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/83542c806dc5c249bf640e344eaf3831cdf2f2ea..7647d46:/templates/webpages/csv_import/form.html
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 6d21fb2e1..8eaed1786 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -2,7 +2,6 @@
[%- USE LxERP %]
[%- USE L %]
[%- USE T8 %]
-
[% FORM.title %]
@@ -87,6 +86,14 @@
[%- 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'.") %]
+
+
+ [1]:
+ [% LxERP.t8('The three columns "make_X", "model_X" and "lastcost_X" with the same number "X" are used to import vendor part numbers and vendor prices.') %]
+ [% LxERP.t8('The column triplets can occur multiple times with different numbers "X" each time (e.g. "make_1", "model_1", "lastcost_1", "make_2", "model_2", "lastcost_2", "make_3", "model_3", "lastcost_3" etc).') %]
+ [% LxERP.t8('The items are imported accoring do their number "X" regardless of the column order inside the file.') %]
+ [% LxERP.t8('The column "make_X" can contain either a vendor\'s database ID, a vendor number or a vendor\'s name.') %]
+
[%- END %]
@@ -99,6 +106,13 @@
[%- LxERP.t8('Settings') %]
+
+
+
+
+
[% 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 %]
+
+
-