X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/7ff0d2ab41abd45fa1d45e6401a3f33c1ebddecd..6f45549b6f3d1f4f178b8799c9997fdc6e1447d0:/templates/webpages/csv_import/form.html
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 26db240d7..cb9d17e1a 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -57,22 +57,52 @@
   
    [% 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.worker.is_multiplexed %]
+     
+       
+         [%- FOREACH ri = SELF.displayable_columns.keys %]
+           | [%- ri %] | 
+         [%- END %]
+       
+       
+         [%- FOREACH ri = SELF.displayable_columns.keys %]
+         
+           
+             
+               | [%- LxERP.t8('Column name') %] | 
+               [%- LxERP.t8('Meaning') %] | 
+              
+
+             [%- FOREACH row = SELF.displayable_columns.$ri %]
+             
+               | [%- HTML.escape(row.name) %] | 
+               [%- HTML.escape(row.description) %] | 
+              
+             [%- END %]
+            
+          | 
+         [%- END %]
+       
+     
+   [%- ELSE %]
+     
+       
+         | [%- LxERP.t8('Column name') %] | 
+         [%- LxERP.t8('Meaning') %] | 
+       
+
+       [%- FOREACH row = SELF.displayable_columns %]
+       
+         | [%- HTML.escape(row.name) %] | 
+         [%- HTML.escape(row.description) %] | 
+       
+       [%- END %]
+     
+   [%- END %]
 
 [%- 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') %]
    
 
@@ -94,6 +124,11 @@
     [% 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.') %]
    
+
+[%- ELSIF SELF.type == 'orders' %]
+   
+     [%- LxERP.t8('Amount and net amount are calculated by kivitendo. verify_amount and verify_netamount can be used for sanity checks.') %]
+   
 [%- END %]
 
    
@@ -203,6 +238,10 @@
  [%- 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' %]
+[%- ELSIF SELF.type == 'orders' %]
+ [%- INCLUDE 'csv_import/_form_orders.html' %]
 [%- END %]