X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcsv_import%2Fform.html;h=c9c9133c9eac960d4e51335bd8fb0864f2158cde;hb=0fb93bcfea648e356bc5e50f7013f6b91db187ef;hp=56e307255d9351cb4c97b1158b8805cddbf4c96c;hpb=29269e9981bc1fd95b32052790688e83a01204df;p=kivitendo-erp.git

diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 56e307255..c9c9133c9 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -45,11 +45,55 @@
 
   <hr>
 
+  <h2>[%- LxERP.t8('Help on column names') %]</h2>
+
+  <div class="help_toggle">
+   <a href="#" onClick="javascript:$('.help_toggle').toggle()">[% LxERP.t8("Show help text") %]</a>
+  </div>
+
+  <div class="help_toggle" style="display:none">
+   <p><a href="#" onClick="javascript:$('.help_toggle').toggle()">[% LxERP.t8("Hide help text") %]</a></p>
+
+   <table>
+    <tr class="listheading">
+     <th>[%- LxERP.t8('Column name') %]</th>
+     <th>[%- LxERP.t8('Meaning') %]</th>
+    </tr>
+
+    [%- FOREACH row = SELF.displayable_columns %]
+     <tr class="listrow[% loop.count % 2 %]">
+      <td>[%- HTML.escape(row.name) %]</td>
+      <td>[%- HTML.escape(row.description) %]</td>
+     </tr>
+    [%- END %]
+   </table>
+
+[%- IF SELF.type == 'contacts' %]
+   <p>
+    [%- 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') %]
+   </p>
+
+[%- ELSIF SELF.type == 'addresses' %]
+   <p>
+    [%- 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.', 'trans_id') %]
+   </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>
+[%- END %]
+
+  </div>
+
+  <hr>
+
   <h2>[%- LxERP.t8('Settings') %]</h2>
 
   <table>
    <tr>
-    <th align="right">[%- LxERP.t8('Number format') %]:</th>
+    <th align="right">[%- LxERP.t8('Number Format') %]:</th>
     <td colspan="10">
      [% SET options = L.options_for_select([ '1.000,00', '1000,00', '1,000.00', '1000.00' ], default => SELF.profile.get('numberformat')) %]
      [% L.select_tag('settings.numberformat', options, style => 'width: 300px') %]
@@ -112,9 +156,9 @@
    <tr>
     <th align="right">[%- LxERP.t8('Check for duplicates') %]:</th>
     <td colspan="10">
-     [% opts = [ [ 'no_check', LxERP.t8('Do not check for duplicates') ],
+     [% opts = [ [ 'no_check',  LxERP.t8('Do not check for duplicates') ],
                  [ 'check_csv', LxERP.t8('Discard duplicate entries in CSV file') ],
-                 [ 'check_db',  LxERP.t8('Discard entries with duplicates in database and CSV file') ] ] %]
+                 [ 'check_db',  LxERP.t8('Discard entries with duplicates in database or CSV file') ] ] %]
      [% L.select_tag('settings.duplicates', L.options_for_select(opts, default => SELF.profile.get('duplicates')), style => 'width: 300px') %]
     </td>
    </tr>
@@ -139,10 +183,22 @@
 
   </table>
 
-  [% L.submit_tag('action_test', LxERP.t8('Gogogo')) %]
+  [% 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 %]
 
  </form>
 
+ [%- IF SELF.import_status %]
+  [%- IF SELF.errors %]
+   [%- PROCESS 'csv_import/_errors.html' %]
+  [%- END %]
+
+  [%- PROCESS 'csv_import/_result.html' %]
+  [%- PROCESS 'csv_import/_preview.html' %]
+ [%- END %]
+
  <script type="text/javascript">
   <!--
     $(document).ready(function() {