From: Moritz Bunkus Date: Mon, 23 Jan 2017 10:53:05 +0000 (+0100) Subject: Verkaufswertbericht: keine Multibox mehr nutzen X-Git-Tag: release-3.5.4~1667^2~13 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=25000c1e78ff40c097ea0872d46a9a8da4608313;p=kivitendo-erp.git Verkaufswertbericht: keine Multibox mehr nutzen --- diff --git a/bin/mozilla/vk.pl b/bin/mozilla/vk.pl index c7a886feb..25e351d0d 100644 --- a/bin/mozilla/vk.pl +++ b/bin/mozilla/vk.pl @@ -36,6 +36,7 @@ use POSIX qw(strftime); use List::Util qw(sum first); use SL::AM; +use SL::DB::Employee; use SL::VK; use SL::IS; use SL::ReportGenerator; @@ -57,18 +58,17 @@ sub search_invoice { my ($customer); - # setup customer selection - $form->all_vc(\%myconfig, "customer", "AR"); + $::request->layout->add_javascripts("autocomplete_project.js"); $form->{title} = $locale->text('Sales Report'); - $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, - "departments" => "ALL_DEPARTMENTS", + $form->get_lists("departments" => "ALL_DEPARTMENTS", "business_types" => "ALL_BUSINESS_TYPES", "salesmen" => "ALL_SALESMEN", - 'employees' => 'ALL_EMPLOYEES', - 'partsgroup' => 'ALL_PARTSGROUPS', - "customers" => "ALL_VC"); + 'partsgroup' => 'ALL_PARTSGROUPS'); + + $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all_sorted; + $form->{CUSTOM_VARIABLES_IC} = CVar->get_configs('module' => 'IC'); ($form->{CUSTOM_VARIABLES_FILTER_CODE_IC}, $form->{CUSTOM_VARIABLES_INCLUSION_CODE_IC}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES_IC}, @@ -80,10 +80,6 @@ sub search_invoice { $form->{CUSTOM_VARIABLES_INCLUSION_CODE_CT}) = CVar->render_search_options('variables' => $form->{CUSTOM_VARIABLES_CT}, 'include_prefix' => 'l_', 'include_value' => 'Y'); - $form->{vc_keys} = sub { "$_[0]->{name}--$_[0]->{id}" }; - $form->{employee_labels} = sub { $_[0]->{"name"} || $_[0]->{"login"} }; - $form->{salesman_labels} = $form->{employee_labels}; - $form->header; print $form->parse_html_template('vk/search_invoice', { %myconfig }); diff --git a/templates/webpages/vk/search_invoice.html b/templates/webpages/vk/search_invoice.html index f34794f25..7d5b0eb98 100644 --- a/templates/webpages/vk/search_invoice.html +++ b/templates/webpages/vk/search_invoice.html @@ -1,5 +1,5 @@ -[%- USE T8 %] -[%- USE L %] +[%- USE T8 %][%- USE L %][%- USE P -%] +[%- SET style="width: 250px" %]

[% title %]

@@ -63,26 +63,10 @@ [% 'Customer' | $T8 %] - - [%- INCLUDE 'generic/multibox.html' - name = 'customer', - default = oldcustomer, - style = 'width: 250px', - DATA = ALL_VC, - id_sub = 'vc_keys', - label_key = 'name', - select = vc_select, - limit = vclimit, - show_empty = 1, - allow_textbox = 1, - class = 'initial_focus', - -%] - + [% P.input_tag("customer", "", class="initial_focus", style=style) %] [% 'Customer Number' | $T8 %] - - - + [% P.input_tag("customernumber", "", style=style) %] @@ -92,111 +76,49 @@ ALL_DEPARTMENTS, title_key = 'description', with_empty = 1, - style = 'width: 250px') + style = style) -%] [% 'Project Number' | $T8 %] - - [%- INCLUDE 'generic/multibox.html' - name = 'project_id', - style = "width: 250px", - DATA = ALL_PROJECTS, - id_key = 'id', - label_key = 'projectnumber', - limit = vclimit, - show_empty = 1, - allow_textbox = 0, - -%] - + [% P.project_picker("project_id", "", style=style) %] [% 'Part Number' | $T8 %] - + [% P.input_tag("partnumber", "", style=style) %] [% 'Part Description' | $T8 %] - - - + [% P.input_tag("description", "", style=style) %] [% 'Partsgroup' | $T8 %] - - [%- INCLUDE 'generic/multibox.html' - name = 'partsgroup_id', - style = 'width: 250px', - DATA = ALL_PARTSGROUPS, - id_key = 'id', - label_key = 'partsgroup', - show_empty = 1, - allow_textbox = 0, - -%] - - + [% P.select_tag("partsgroupd_id", ALL_PARTSGROUPS, title_key="partsgroup", with_empty=1, style=style) %] [% 'Country' | $T8 %] - + [% P.input_tag("country", "", style=style) %] [% 'Employee' | $T8 %] - - [%- INCLUDE 'generic/multibox.html' - name = 'employee_id', - style = 'width: 250px', - DATA = ALL_EMPLOYEES, - id_key = 'id', - label_sub = 'employee_labels', - limit = vclimit, - show_empty = 1, - allow_textbox = 0, - default = ' ', - -%] - + [% L.select_tag("employee_id", ALL_EMPLOYEES, title_key="safe_name", with_empty=1, style=style) %] [% 'Salesman' | $T8 %] - - [%- INCLUDE 'generic/multibox.html' - name = 'salesman_id', - style = 'width: 250px', - DATA = ALL_SALESMEN, - id_key = 'id', - label_sub = 'salesman_labels', - limit = vclimit, - show_empty = 1, - allow_textbox = 0, - -%] - + [% L.select_tag("salesman_id", ALL_EMPLOYEES, title_key="safe_name", with_empty=1, style=style) %] [% 'Customer type' | $T8 %] - - [%- INCLUDE 'generic/multibox.html' - name = 'business_id', - style = "width: 250px", - DATA = ALL_BUSINESS_TYPES, - id_key = 'id', - label_key = 'description', - limit = vclimit, - show_empty = 1, - allow_textbox = 0, - -%] - + [% L.select_tag("business_id", ALL_BUSINESS_TYPES, title_key="description", with_empty=1, style=style) %] [% 'Invoice Date' | $T8 %] [% 'From' | $T8 %] [% L.date_tag('transdatefrom') %] - - - [% 'Bis' | $T8 %] - - + [% 'Bis' | $T8 %] [% L.date_tag('transdateto') %]