gelöschte Benutzer in oe/search ausblenden

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 11231515d992e7581fe8699988f082e47232fa34..58f4cf5f34219f0322a04b16763004cae84d1ace 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -708,16 +708,13 @@ sub search {
   # setup vendor / customer data
   $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
   $form->get_lists("projects"     => { "key" => "ALL_PROJECTS", "all" => 1 },
   # setup vendor / customer data
   $form->all_vc(\%myconfig, $form->{vc}, ($form->{vc} eq 'customer') ? "AR" : "AP");
   $form->get_lists("projects"     => { "key" => "ALL_PROJECTS", "all" => 1 },

-                   "employees"    => "ALL_EMPLOYEES",
-                   "salesmen"     => "ALL_SALESMEN",

                    "departments"  => "ALL_DEPARTMENTS",
                    "$form->{vc}s" => "ALL_VC");
                    "departments"  => "ALL_DEPARTMENTS",
                    "$form->{vc}s" => "ALL_VC");

+  $form->{ALL_EMPLOYEES} = SL::DB::Manager::Employee->get_all(query => [ deleted => 0 ]);

 
   # constants and subs for template
   $form->{jsscript}        = 1;
 
   # constants and subs for template
   $form->{jsscript}        = 1;

-  $form->{employee_labels} = sub { $_[0]->{"name"} || $_[0]->{"login"} };

   $form->{vc_keys}         = sub { "$_[0]->{name}--$_[0]->{id}" };
   $form->{vc_keys}         = sub { "$_[0]->{name}--$_[0]->{id}" };

-  $form->{salesman_labels} = $form->{employee_labels};

 
   $form->header();
 
 
   $form->header();
 

diff --git a/templates/webpages/oe/search.html b/templates/webpages/oe/search.html
index 22d83b017cfffae9366803bcd79242c2d42271d4..8f39ea208c0a1c9ca17add52a10ef9bd3735d68d 100644 (file)
--- a/templates/webpages/oe/search.html
+++ b/templates/webpages/oe/search.html
@@ -54,34 +54,11 @@
     </tr>
     <tr>
      <th align="right">[% 'Employee' | $T8 %]</th>
     </tr>
     <tr>
      <th align="right">[% 'Employee' | $T8 %]</th>

-     <td>
-            [%- 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       = ' ',
-            -%]
-     </td>
+     <td>[% L.select_tag('employee_id', L.options_for_select(ALL_EMPLOYEES, title='safe_name', with_empty=1), style='width:250px') %]</td>

     </tr>
     <tr>
      <th align="right">[% 'Salesman' | $T8 %]</th>
     </tr>
     <tr>
      <th align="right">[% 'Salesman' | $T8 %]</th>

-     <td>
-            [%- 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,
-            -%]
-     </td>
+     <td>[% L.select_tag('salesman_id', L.options_for_select(ALL_EMPLOYEES, title='safe_name', with_empty=1), style='width:250px') %]</td>

     </tr>
     <tr>
      <th align="right">[% 'Transaction description' | $T8 %]</th>
     </tr>
     <tr>
      <th align="right">[% 'Transaction description' | $T8 %]</th>