fix von salesmen und employee bzw. split in zwei eigenständige Funktionen durch get_l...

diff --git a/SL/Form.pm b/SL/Form.pm
index 3719515c3335f67b2c2eeb1e556eeab37f763741..4472dfcc6a00103388326ad111cd7fbaacae0a2f 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -1409,8 +1409,8 @@ sub get_employee {
   my ($self, $dbh) = @_;
 
   my $query = qq|SELECT id, name FROM employee WHERE login = ?|;
   my ($self, $dbh) = @_;
 
   my $query = qq|SELECT id, name FROM employee WHERE login = ?|;

-  ($self->{employee_id}, $self->{employee}) = selectrow_query($self, $dbh, $query, $self->{login});
-  $self->{employee_id} *= 1;
+  ($self->{"employee_id"}, $self->{"employee"}) = selectrow_query($self, $dbh, $query, $self->{login});
+  $self->{"employee_id"} *= 1;

 
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }


@@ -1620,6 +1620,18 @@ sub _get_employees {
   $main::lxdebug->leave_sub();
 }
 
   $main::lxdebug->leave_sub();
 }
 

+sub _get_salesmen {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $dbh, $key) = @_;
+
+  $key = "all_salesmen" unless ($key);
+  $self->{$key} =
+    selectall_hashref_query($self, $dbh, qq|SELECT * FROM employee|);
+
+  $main::lxdebug->leave_sub();
+}
+

 sub _get_business_types {
   $main::lxdebug->enter_sub();
 
 sub _get_business_types {
   $main::lxdebug->enter_sub();
 


@@ -1779,6 +1791,10 @@ sub get_lists {
   if ($params{"employees"}) {
     $self->_get_employees($dbh, $params{"employees"});
   }
   if ($params{"employees"}) {
     $self->_get_employees($dbh, $params{"employees"});
   }

+  
+  if ($params{"salesmen"}) {
+    $self->_get_salesmen($dbh, $params{"salesmen"});
+  }

 
   if ($params{"business_types"}) {
     $self->_get_business_types($dbh, $params{"business_types"});
 
   if ($params{"business_types"}) {
     $self->_get_business_types($dbh, $params{"business_types"});

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index e03e83eb150e3b6b1c31f75750e5b4318ecd69b8..ccc9ef1736b55ea58e54b32ee83a1bc22e906f16 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -374,7 +374,7 @@ sub form_header {
   }
 
   # set option selected
   }
 
   # set option selected

-  foreach $item ($form->{vc}, currency, department, employee, ($form->{vc} eq "customer" ? customer : vendor)) {
+  foreach $item ($form->{vc}, currency, department, ($form->{vc} eq "customer" ? customer : vendor)) {

     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~
       s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
     $form->{"select$item"} =~ s/ selected//;
     $form->{"select$item"} =~
       s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;


@@ -396,7 +396,8 @@ sub form_header {
                    "projects" => { "key" => "ALL_PROJECTS",
                                    "all" => 0,
                                    "old_id" => \@old_project_ids },
                    "projects" => { "key" => "ALL_PROJECTS",
                                    "all" => 0,
                                    "old_id" => \@old_project_ids },

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

                    "taxzones" => "ALL_TAXZONES",
                    "payments" => "ALL_PAYMENTS",
                    "currencies" => "ALL_CURRENCIES",
                    "taxzones" => "ALL_TAXZONES",
                    "payments" => "ALL_PAYMENTS",
                    "currencies" => "ALL_CURRENCIES",


@@ -487,21 +488,20 @@ sub form_header {
     NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
                          '-labels' => \%labels,
                          '-default' => $form->{"globalproject_id"}));
     NTI($cgi->popup_menu('-name' => 'globalproject_id', '-values' => \@values,
                          '-labels' => \%labels,
                          '-default' => $form->{"globalproject_id"}));

-
-  $salesman = "";
+  
+  my $salesmen = "";
+  %labels = ();
+  @values = ();

   if ($form->{type} =~ /^sales_/) {
   if ($form->{type} =~ /^sales_/) {

-    %labels = ();
-    @values = ("");
-    foreach my $item (@{ $form->{ALL_SALESMEN} }) {
-      push(@values, $item->{id});
-      $labels{$item->{id}} = $item->{name} ne "" ? $item->{name} : $item->{login};
+    foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
+      push(@values, $item->{"id"});
+      $labels{$item->{"id"}} = ($item->{"name"} ne "" ? $item->{"name"} : $item->{"login"});

     }
     }

-
-    $salesman =
+    $salesmen =

       qq|<tr>
           <th align="right">| . $locale->text('Salesman') . qq|</th>
           <td>| .
       qq|<tr>
           <th align="right">| . $locale->text('Salesman') . qq|</th>
           <td>| .

-      NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id},
+      NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{"salesman_id"} ? $form->{"salesman_id"} : $form->{"employee_id"},

                            '-values' => \@values, '-labels' => \%labels))
       . qq|</td>
          </tr>|;
                            '-values' => \@values, '-labels' => \%labels))
       . qq|</td>
          </tr>|;


@@ -509,16 +509,16 @@ sub form_header {
 
   %labels = ();
   @values = ();
 
   %labels = ();
   @values = ();

-  foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
+  foreach my $item (@{ $form->{"ALL_EMPLOYEES"} }) {

     push(@values, $item->{"id"});
     push(@values, $item->{"id"});

-    $labels{$item->{"id"}} = $item->{"name"};
+    $labels{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"};

   }
 
   }
 

-  my $employees = qq|
+  my $employee = qq|

     <tr>
       <th align="right">| . $locale->text('Employee') . qq|</th>
       <td>| .
     <tr>
       <th align="right">| . $locale->text('Employee') . qq|</th>
       <td>| .

-        NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee"},
+        NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},

                              '-values' => \@values, '-labels' => \%labels)) . qq|
       </td>
     </tr>|;
                              '-values' => \@values, '-labels' => \%labels)) . qq|
       </td>
     </tr>|;


@@ -707,16 +707,12 @@ sub form_header {
 
   if ($form->{type} eq 'sales_order') {
     if ($form->{selectemployee}) {
 
   if ($form->{type} eq 'sales_order') {
     if ($form->{selectemployee}) {

-      $employee = qq|
-    <input type=hidden name=customer_klass value=$form->{customer_klass}>
-        $employees
-|;
+      $employee .= qq|
+        <input type="hidden" name="customer_klass" value="$form->{customer_klass}">|;

     }
   } else {
     }
   } else {

-    $employee = qq|
-    <input type=hidden name=customer_klass value=$form->{customer_klass}>
-        $employees
-|;
+    $employee .= qq|
+      <input type="hidden" name="customer_klass" value="$form->{customer_klass}">|;

   }
   if ($form->{resubmit} && ($form->{format} eq "html")) {
     $onload =
   }
   if ($form->{resubmit} && ($form->{format} eq "html")) {
     $onload =


@@ -821,7 +817,7 @@ print qq|       </table>
            <table>
              $openclosed
              $employee
            <table>
              $openclosed
              $employee

-        $salesman
+        $salesmen

              $ordnumber
              <tr>
           <th width="70%" align="right" nowrap>| . $locale->text('Project Number') . qq|</th>
              $ordnumber
              <tr>
           <th width="70%" align="right" nowrap>| . $locale->text('Project Number') . qq|</th>