Verkaufsrechnung: Die Drop-Down-Box für den Bearbeiter heißt nun employee_id (wie...

diff --git a/SL/IS.pm b/SL/IS.pm
index 97f6fef05309d1b47911bbf0d5f15e9e3b5425c8..7b67528896913f9caa708a26b726145f08975417 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -489,8 +489,7 @@ sub post_invoice {
   my ($query, $sth, $null, $project_id, $deliverydate, @values);
   my $exchangerate = 0;
 
   my ($query, $sth, $null, $project_id, $deliverydate, @values);
   my $exchangerate = 0;
 

-  ($null, $form->{employee_id}) = split(/--/, $form->{employee});
-  unless ($form->{employee_id}) {
+  if (!$form->{employee_id}) {

     $form->get_employee($dbh);
   }
 
     $form->get_employee($dbh);
   }
 

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 693914fa755af8e672e59b2b346aa0edfc26d9a8..b8eb074796eafdd9a55e86e03cc6c79e01fd42a9 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -357,14 +357,14 @@ sub form_header {
   @values = ();
   foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
     push(@values, $item->{"id"});
   @values = ();
   foreach my $item (@{ $form->{"ALL_SALESMEN"} }) {
     push(@values, $item->{"id"});

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

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

-        NTI($cgi->popup_menu('-name' => 'employee', '-default' => $form->{"employee_id"},
+        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>|;


@@ -438,7 +438,7 @@ sub form_header {
                          '-default' => $form->{"globalproject_id"}));
 
   %labels = ();
                          '-default' => $form->{"globalproject_id"}));
 
   %labels = ();

-  @values = ("");
+  @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};


@@ -448,8 +448,8 @@ sub form_header {
     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},
-                               '-values' => \@values, '-labels' => \%labels))
+     NTI($cgi->popup_menu('-name' => 'salesman_id', '-default' => $form->{salesman_id} ? $form->{salesman_id} : $form->{employee_id},
+                          '-values' => \@values, '-labels' => \%labels))

      . qq|</td>
          </tr>|;
 
      . qq|</td>
          </tr>|;