From: G. Richardson Date: Tue, 20 Jan 2015 15:49:23 +0000 (+0100) Subject: Benutzerdefinierte Variable: Parts als Partpicker X-Git-Tag: release-3.2.0beta~61 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=ac6d3a20575e77752a9ed40fb1dd39f675a22c10;p=kivitendo-erp.git Benutzerdefinierte Variable: Parts als Partpicker noch vorhandene L.part_select nach L.part_picker geändert. Analog wie für CustomerVendor-Picker (siehe Commit 65b7c724e) --- diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index b8cd626bc..fd46ed745 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -323,7 +323,7 @@ sub form_header { $form->{follow_up_trans_info} = $form->{donumber} .'('. $follow_up_vc .')'; - $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer)); + $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part)); $form->header(); # Fix für Bug 1082 Erwartet wird: 'abteilungsNAME--abteilungsID' diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl index e71a6dace..b9ede695e 100644 --- a/bin/mozilla/ir.pl +++ b/bin/mozilla/ir.pl @@ -337,7 +337,7 @@ sub form_header { ), @custom_hiddens, map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}]; - $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer)); + $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part)); $form->header(); diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl index fe561cc5e..d0805841c 100644 --- a/bin/mozilla/is.pl +++ b/bin/mozilla/is.pl @@ -385,7 +385,7 @@ sub form_header { ), @custom_hiddens, map { $_.'_rate', $_.'_description', $_.'_taxnumber' } split / /, $form->{taxaccounts}]; - $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer)); + $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part)); $form->header(); diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl index 3d5b8aeec..904a4b9fe 100644 --- a/bin/mozilla/oe.pl +++ b/bin/mozilla/oe.pl @@ -465,7 +465,7 @@ sub form_header { } } - $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer)); + $::request->{layout}->use_javascript(map { "${_}.js" } qw(kivi.SalesPurchase show_form_details show_history show_vc_details ckeditor/ckeditor ckeditor/adapters/jquery kivi.io autocomplete_customer autocomplete_part)); $form->header; if ($form->{CFDD_shipto} && $form->{CFDD_shipto_id} ) { diff --git a/templates/webpages/amcvar/render_inputs.html b/templates/webpages/amcvar/render_inputs.html index 59021cd3c..a2f39ac62 100644 --- a/templates/webpages/amcvar/render_inputs.html +++ b/templates/webpages/amcvar/render_inputs.html @@ -31,7 +31,7 @@ [% L.customer_vendor_picker(var_name, var.value, type='vendor') %] [%- ELSIF var.type == 'part' %] -[% L.part_selector(var_name, var.value) %] +[% L.part_picker(var_name, var.value) %] [%- ELSIF var.type == 'select' %] diff --git a/templates/webpages/amcvar/render_inputs_block.html b/templates/webpages/amcvar/render_inputs_block.html index 5d668e1b0..8f0b20f3e 100644 --- a/templates/webpages/amcvar/render_inputs_block.html +++ b/templates/webpages/amcvar/render_inputs_block.html @@ -63,7 +63,7 @@ [%- L.customer_vendor_picker(cvar_tag_name, cvar.value, render_cvar_tag_options) %] [%- ELSIF cvar.var.type == 'part' %] -[% L.part_selector(cvar_tag_name, cvar.value, render_cvar_tag_options) %] +[% L.part_picker(cvar_tag_name, cvar.value, render_cvar_tag_options) %] [%- ELSIF cvar.var.type == 'number' %] [%- L.input_tag(cvar_tag_name, LxERP.format_amount(cvar.value, -2), render_cvar_tag_options) %]