X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=templates%2Fwebpages%2Fcsv_import%2Fform.html;h=9fd30ac1d953bc09272b571b805ff64c16215239;hb=b16b33c220a567bf8a8b998ff69d44d380b0a181;hp=eba42f6a97784022b21acc2b3299b3697ffb4f32;hpb=6f92326a8f2c1f9205a062d32ed8f1abdaa4b7b5;p=kivitendo-erp.git diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html index eba42f6a9..9fd30ac1d 100644 --- a/templates/webpages/csv_import/form.html +++ b/templates/webpages/csv_import/form.html @@ -2,7 +2,6 @@ [%- USE LxERP %] [%- USE L %] [%- USE T8 %] -
[% FORM.title %]
@@ -27,7 +26,7 @@ [%- LxERP.t8('Existing profiles') %]: - [% L.select_tag('profile.id', L.options_for_select(SELF.all_profiles, title => 'name', default => SELF.profile.id), style => 'width: 300px') %] + [% L.select_tag('profile.id', SELF.all_profiles, title_key = 'name', default = SELF.profile.id, style = 'width: 300px') %] [% L.submit_tag('action_new', LxERP.t8('Load profile')) %] @@ -74,6 +73,7 @@ [%- IF SELF.type == 'contacts' %]

+ [%- LxERP.t8("You can update existing contacts by providing the 'cp_id' column with their database IDs. Otherwise: ") %] [%- 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') %]

@@ -87,6 +87,14 @@ [%- 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'.") %]

+ +

+ [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.') %] + [% LxERP.t8('The column triplets can occur multiple times with different numbers "X" each time (e.g. "make_1", "model_1", "lastcost_1", "make_2", "model_2", "lastcost_2", "make_3", "model_3", "lastcost_3" etc).') %] + [% 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.') %] +

[%- END %]

@@ -99,18 +107,24 @@

[%- LxERP.t8('Settings') %]

+ + + +
+ [% 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 %] + [% L.submit_tag('action_import', LxERP.t8('Import'), style='display:none') %] - [%- IF SELF.import_status %] - [%- IF SELF.errors %] - [%- PROCESS 'csv_import/_errors.html' %] - [%- END %] - - [%- PROCESS 'csv_import/_result.html' %] - [%- PROCESS 'csv_import/_preview.html' %] +
+ [%- IF SELF.deferred %] + [%- PROCESS 'csv_import/_deferred_results.html' %] + [%- ELSIF SELF.import_status %] + [%- PROCESS 'csv_import/_results.html' %] [%- END %] +
+ - - \ No newline at end of file