From: Sven Schöling Date: Fri, 10 Feb 2012 17:04:39 +0000 (+0100) Subject: gelöschte Benutzer in do/search ausblenden X-Git-Tag: release-2.7.0beta2~5^2~26 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7f109935fea293ad71b68263a2f13bd1730e9b73;p=kivitendo-erp.git gelöschte Benutzer in do/search ausblenden --- diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl index 39cba4a2b..f06bd3256 100644 --- a/bin/mozilla/do.pl +++ b/bin/mozilla/do.pl @@ -448,9 +448,8 @@ sub search { $form->get_lists("projects" => { "key" => "ALL_PROJECTS", "all" => 1 }, - "employees" => "ALL_EMPLOYEES", - "salesmen" => "ALL_SALESMEN", "$form->{vc}s" => "ALL_VC"); + $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]); $form->{SHOW_VC_DROP_DOWN} = $myconfig{vclimit} > scalar @{ $form->{ALL_VC} }; $form->{jsscript} = 1; diff --git a/templates/webpages/do/search.html b/templates/webpages/do/search.html index 811384c6f..b2ad1704f 100644 --- a/templates/webpages/do/search.html +++ b/templates/webpages/do/search.html @@ -1,4 +1,5 @@ [%- USE T8 %] +[%- USE L %] [% USE HTML %][% USE LxERP %] [%- IF vc == 'customer' %] @@ -72,27 +73,13 @@ [% 'Employee' | $T8 %] - - - + [% L.select_tag('employee_id', L.options_for_select(ALL_EMPLOYEES, title='safe_name', with_empty=1), class='fixed_width') %] [%- IF is_customer %] [% 'Salesman' | $T8 %] - - - + [% L.select_tag('salesman_id', L.options_for_select(ALL_EMPLOYEES, title='safe_name', with_empty=1), class='fixed_width') %] [%- END %]