X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcsv_import%2Fform.html;h=568324e28bedb3ae652ef1424ed4276d5292edcc;hb=549f187d3a2b1d15f96c4556714666ed954447bb;hp=a1ca61c7a9caf2356f586b7e3ad62d7950e3b9bd;hpb=d8b09e08865f37d0cbdbb59d6778afc9d18b06fc;p=kivitendo-erp.git
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index a1ca61c7a..568324e28 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -68,7 +68,7 @@
[%- p.row_ident %] |
[%- END %][%# FOREACH SELF.worker.profile %]
-
+
[%- FOREACH p = SELF.worker.profile %]
[% SET ri = p.row_ident %]
@@ -141,22 +141,25 @@
[%- 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.') %]
-[%- ELSIF SELF.type == 'orders' OR SELF.type == 'ar_transactions' %]
+[%- ELSIF SELF.type == 'orders' OR SELF.type == 'delivery_orders' OR SELF.type == 'ar_transactions' %]
[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.') %]
-
- [2]:
- [%- LxERP.t8('Amount and net amount are calculated by kivitendo. "verify_amount" and "verify_netamount" can be used for sanity checks.') %]
- [%- LxERP.t8('If amounts differ more than "Maximal amount difference" (see settings), this item is marked as invalid.') %]
-
+ [%- IF SELF.type == 'orders' OR SELF.type == 'ar_transactions' %]
+
+ [2]:
+ [%- LxERP.t8('Amount and net amount are calculated by kivitendo. "verify_amount" and "verify_netamount" can be used for sanity checks.') %]
+ [%- LxERP.t8('If amounts differ more than "Maximal amount difference" (see settings), this item is marked as invalid.') %]
+
+ [%- END %]
[%- END %][%# IF SELF.type == ⦠%]
+
-
- [%- L.submit_tag('action_download_sample', LxERP.t8('Download sample file')) %]
-
-
+
+
+ [%- L.submit_tag('action_download_sample', LxERP.t8('Download sample file')) %]
+
@@ -178,6 +181,13 @@
|
+
+ [%- LxERP.t8('Date Format') %]: |
+
+ [% L.select_tag('settings.dateformat', ['dd.mm.yyyy', 'yyyy-mm-dd', 'dd/mm/yyyy', 'mm/dd/yyyy' ], default = SELF.profile.get('dateformat'), style = 'width: 300px') %]
+ |
+
+
[%- LxERP.t8('Charset') %]: |
[% L.select_tag('settings.charset', SELF.all_charsets, default = SELF.profile.get('charset'), style = 'width: 300px') %] |
@@ -266,6 +276,8 @@
[%- INCLUDE 'csv_import/_form_inventories.html' %]
[%- ELSIF SELF.type == 'orders' %]
[%- INCLUDE 'csv_import/_form_orders.html' %]
+[%- ELSIF SELF.type == 'delivery_orders' %]
+ [%- INCLUDE 'csv_import/_form_delivery_orders.html' %]
[%- ELSIF SELF.type == 'ar_transactions' %]
[%- INCLUDE 'csv_import/_form_artransactions.html' %]
[%- ELSIF SELF.type == 'bank_transactions' %]
@@ -275,9 +287,9 @@
[%- LxERP.t8('Preview Mode') %]: |
- [% L.radio_button_tag('settings.full_preview', value=2, checked=SELF.profile.get('full_preview')==2, label=LxERP.t8('Full Preview')) %]
- [% L.radio_button_tag('settings.full_preview', value=1, checked=SELF.profile.get('full_preview')==1, label=LxERP.t8('Only Warnings and Errors')) %]
- [% L.radio_button_tag('settings.full_preview', value=0, checked=!SELF.profile.get('full_preview'), label=LxERP.t8('First 20 Lines')) %]
+ [% L.radio_button_tag('settings.full_preview', value=0, checked=!SELF.profile.get('full_preview'), label=LxERP.t8('Full Preview')) %]
+ [% L.radio_button_tag('settings.full_preview', value=1, checked=SELF.profile.get('full_preview')==1, label=LxERP.t8('Only Lines with Notes or Errors')) %]
+ [% L.radio_button_tag('settings.full_preview', value=2, checked=SELF.profile.get('full_preview')==2, label=LxERP.t8('First 20 Lines')) %]
|