X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/6f45549b6f3d1f4f178b8799c9997fdc6e1447d0..27653d6bbb72f61e0064580d3c9b4185df02efe5:/templates/webpages/csv_import/form.html

diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index cb9d17e1a..cbe49771d 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -60,12 +60,13 @@
    [%- IF SELF.worker.is_multiplexed %]
      <table>
        <tr class="listheading">
-         [%- FOREACH ri = SELF.displayable_columns.keys %]
-           <th>[%- ri %]</th>
+         [%- FOREACH p = SELF.worker.profile %]
+           <th>[%- p.row_ident %]</th>
          [%- END %]
        </tr>
        <tr class="listrow[% loop.count % 2 %]">
-         [%- FOREACH ri = SELF.displayable_columns.keys %]
+         [%- FOREACH p = SELF.worker.profile %]
+           [% SET ri = p.row_ident %]
          <td>
            <table>
              <tr class="listheading">
@@ -112,11 +113,6 @@
    </p>
 
 [%- ELSIF SELF.type == 'parts' %]
-   <p>
-    [%- 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'.") %]
-   </p>
-
    <p>
     [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.') %]
@@ -124,10 +120,25 @@
     [% 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.') %]
    </p>
+    <p>
+    [2]:
+    [% LxERP.t8('Onhand only sets the quantity in master data, not in inventory. This is only a legacy info field and will be overwritten as soon as a inventory transfer happens.') %]
+   </p>
+   <p>
+    [3]:
+    [% 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'.") %]
+   </p>
 
 [%- ELSIF SELF.type == 'orders' %]
    <p>
-     [%- LxERP.t8('Amount and net amount are calculated by kivitendo. verify_amount and verify_netamount can be used for sanity checks.') %]
+    [1]:
+    [% LxERP.t8('The column "datatype" must be present and must be at the same position / column in each data set. The values must be the row names (see settings) for order and item data respectively.') %]
+   </p>
+   <p>
+    [2]:
+    [%- LxERP.t8('Amount and net amount are calculated by kivitendo. "verify_amount" and "verify_netamount" can be used for sanity checks.') %]<br>
+    [%- LxERP.t8('If amounts differ more than "Maximal amount difference" (see settings), this item is marked as invalid.') %]<br>
    </p>
 [%- END %]