customernotes auch als notes Form Variable(fixmaster)

[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 97b28aeb41716e9119337f9718ef1b13b8bd6fb1..792aa2086ed305d480e5e85965146ccf7195a61a 100644 (file)
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -2,8 +2,7 @@
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE T8 %]
 [%- USE LxERP %]
 [%- USE L %]
 [%- USE T8 %]

-
- <div class="listtop">[% FORM.title %]</div>
+ <h1>[% FORM.title %]</h1>

 
  [%- INCLUDE 'common/flash.html' %]
 
 
  [%- INCLUDE 'common/flash.html' %]
 


@@ -60,12 +59,13 @@
    [%- IF SELF.worker.is_multiplexed %]
      <table>
        <tr class="listheading">
    [%- 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 %]">
          [%- 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">
          <td>
            <table>
              <tr class="listheading">


@@ -112,11 +112,6 @@
    </p>
 
 [%- ELSIF SELF.type == 'parts' %]
    </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.') %]
    <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,11 +119,31 @@
     [% 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>
     [% 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', '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.") %]
+   </p>

 
 

-[%- ELSIF SELF.type == 'orders' %]
+[%- ELSIF SELF.type == 'inventories' %]
+   <p>
+    [%- LxERP.t8('One of the columns "qty" or "target_qty" must be given. If "target_qty" is given, the quantity to transfer for each transfer will be calculate, so that the quantity for this part, warehouse and bin will result in the given "target_qty" after each transfer.') %]
+   </p>
+
+[%- ELSIF SELF.type == 'orders' OR SELF.type == 'ar_transactions' %]
+   <p>
+    [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>
    <p>

-     [%- 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" (settings), this item is marked as invalid.') %]<br>
+    [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 %]
 
    </p>
 [%- END %]
 


@@ -153,7 +168,7 @@
    <tr>
     <th align="right">[%- LxERP.t8('Number Format') %]:</th>
     <td colspan="10">
    <tr>
     <th align="right">[%- LxERP.t8('Number Format') %]:</th>
     <td colspan="10">

-     [% L.select_tag('settings.numberformat', ['1.000,00', '1000,00', '1,000.00', '1000.00'], default = SELF.profile.get('numberformat'), style = 'width: 300px') %]
+     [% L.select_tag('settings.numberformat', ['1.000,00', '1000,00', '1,000.00', '1000.00', "1'000.00"], default = SELF.profile.get('numberformat'), style = 'width: 300px') %]

     </td>
    </tr>
 
     </td>
    </tr>
 


@@ -241,8 +256,14 @@
  [%- INCLUDE 'csv_import/_form_customers_vendors.html' %]
 [%- ELSIF SELF.type == 'contacts' %]
  [%- INCLUDE 'csv_import/_form_contacts.html' %]
  [%- INCLUDE 'csv_import/_form_customers_vendors.html' %]
 [%- ELSIF SELF.type == 'contacts' %]
  [%- INCLUDE 'csv_import/_form_contacts.html' %]

+[%- ELSIF SELF.type == 'inventories' %]
+ [%- INCLUDE 'csv_import/_form_inventories.html' %]

 [%- ELSIF SELF.type == 'orders' %]
  [%- INCLUDE 'csv_import/_form_orders.html' %]
 [%- ELSIF SELF.type == 'orders' %]
  [%- INCLUDE 'csv_import/_form_orders.html' %]

+[%- ELSIF SELF.type == 'ar_transactions' %]
+ [%- INCLUDE 'csv_import/_form_artransactions.html' %]
+[%- ELSIF SELF.type == 'bank_transactions' %]
+ [%- INCLUDE 'csv_import/_form_banktransactions.html' %]

 [%- END %]
 
    <tr>
 [%- END %]
 
    <tr>