Belegvorlagen: Zeilen ohne Betrag beibehalten

[mfinanz.git] / templates / webpages / csv_import / form.html

diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 7ebd6c29b47653102ab78bea673ecd40dd690dce..c3cbcac2e70ffe888bf6061b18a50de5b11b539e 100644 (file)
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -129,9 +129,10 @@
    </p>
    <p>
     [3]:
-    [% LxERP.t8("If the article type is set to 'mixed' then a column called 'type' must be present.") %]
+    [% LxERP.t8("If the article type is set to 'mixed' then a column called 'part_type' or called 'pclass' must be present.") %]
     [% LxERP.t8("Type can be either 'part', 'service' or 'assembly'.") %]
-    [% LxERP.t8("Assemblies can not be imported (yet). But the type column is used for sanity checks on price updates in order to prevent that articles with the wrong type will be updated.") %]
+    [%- LxERP.t8("If column 'pclass' is present the article type is then irrelevant or used as default ") %]
+    [% LxERP.t8("The 'pclass' column has the same abbreviation like a part export. The first letter is for the type Part,Assembly or Service, the second(and third) for Part Classification") %]
    </p>
 
 [%- ELSIF SELF.type == 'inventories' %]
@@ -327,9 +328,9 @@
 
   </div>
   <hr>
-[%- END %]
 [%- END %]
   [% L.submit_tag('action_test', LxERP.t8('Test and preview')) %]
+[%- END %]
   [% L.submit_tag('action_import', LxERP.t8('Import'), style='display:none') %]
 
  </form>
@@ -337,8 +338,6 @@
  <div id='results'>
  [%- IF SELF.deferred %]
    [%- PROCESS 'csv_import/_deferred_results.html' %]
- [%- ELSIF SELF.import_status %]
-   [%- PROCESS 'csv_import/_results.html' %]
  [%- END %]
  </div>