X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/0389fbc606e78cdacea36f4bf385e75f879443a2..f87763cd84d89aafc4c4110ba42d041b02ce4371:/templates/webpages/csv_import/form.html

diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 4ae1cf6d1..bc23d54c2 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -112,9 +112,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 +139,17 @@
 
   </table>
 
-  [% L.submit_tag('action_test', LxERP.t8('Gogogo')) %]
+  [% L.submit_tag('action_test', LxERP.t8('Test and preview')) %]
+  [% IF SELF.import_status && SELF.data.size %]
+   [% L.submit_tag('action_import', LxERP.t8('Import')) %]
+  [%- END %]
 
  </form>
 
+ [%- IF SELF.import_status %]
+  [%- PROCESS 'csv_import/_data.html' %]
+ [%- END %]
+
  <script type="text/javascript">
   <!--
     $(document).ready(function() {