Bindestriche und ID aus den PopupMenus entfernt und in der FOrm.pm die Speicherung...

Manipulationen vermieden werden können.

diff --git a/SL/Form.pm b/SL/Form.pm
index 4472dfc..921832e 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -2496,12 +2496,12 @@ sub save_history {
     &get_employee($self, $dbh);
   }
 
-  my $query =
-    qq|INSERT INTO history_erp (trans_id, employee_id, addition, what_done, snumbers) | .
-    qq|VALUES (?, ?, ?, ?, ?)|;
-  my @values = (conv_i($self->{id}), conv_i($self->{employee_id}),
-                $self->{addition}, $self->{what_done}, "$self->{snumbers}");
-  do_query($self, $dbh, $query, @values);
+my $query =
+   qq|INSERT INTO history_erp (trans_id, employee_id, addition, what_done, snumbers) | .
+   qq|VALUES (?, (SELECT id FROM employee WHERE login = ?), ?, ?, ?)|;
+ my @values = (conv_i($self->{id}), $self->{login},
+               $self->{addition}, $self->{what_done}, "$self->{snumbers}");
+ do_query($self, $dbh, $query, @values);
 
   $main::lxdebug->leave_sub();
 }

diff --git a/bin/mozilla/ir.pl b/bin/mozilla/ir.pl
index c9624cc..9102b43 100644 (file)
--- a/bin/mozilla/ir.pl
+++ b/bin/mozilla/ir.pl
@@ -351,7 +351,7 @@ sub form_header {
   my $i = 0;
   foreach my $item (@{ $form->{"ALL_VENDORS"} }) {
     push(@values, $item->{name}.qq|--|.$item->{"id"});
-    $labels{$item->{"id"}} = $item->{"name"}.qq|--|.$item->{"id"};
+    $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"};
   }
   my $vendors = qq|
       <th align="right">| . $locale->text('Vendor') . qq|</th>

diff --git a/bin/mozilla/is.pl b/bin/mozilla/is.pl
index 7c00555..2cbf9cd 100644 (file)
--- a/bin/mozilla/is.pl
+++ b/bin/mozilla/is.pl
@@ -374,7 +374,7 @@ sub form_header {
   @values = ();
   foreach my $item (@{ $form->{"ALL_CUSTOMERS"} }) {
     push(@values, $item->{name}.qq|--|.$item->{"id"});
-    $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
+    $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"};
   }
 
   my $customers = qq|

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index ccc9ef1..10152d7 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -428,8 +428,8 @@ sub form_header {
   @values = ();
 
   foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) {
-    push(@values, $item->{name}.qq|--|.$item->{"id"});
-    $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
+    push(@values, $item->{"name"}.qq|--|.$item->{"id"});
+    $labels{$item->{"name"}.qq|--|.$item->{"id"}} = $item->{name};
   }
 
   $vc = qq|
@@ -438,7 +438,7 @@ sub form_header {
       <th align="right">| . $locale->text(ucfirst($form->{vc})) . qq|</th>
       <td>| . 
         (($myconfig{vclimit} <=  scalar(@values)) 
-              ? qq|<input type="text" value="| . H($form->{"old$form->{vc}"}) . qq|" name="$form->{vc}">| 
+              ? qq|<input type="text" value="| . H(($form->{"old$form->{vc}"} =~ /^(.*)\-\-.*$/)) . qq|" name="$form->{vc}">| 
               : (NTI($cgi->popup_menu('-name' => "$form->{vc}", '-default' => $form->{"old$form->{vc}"}, 
                              '-onChange' => 'document.getElementById(\'update_button\').click();',
                              '-values' => \@values, '-labels' => \%labels, '-style' => 'width: 250px')))) . qq|
@@ -1386,6 +1386,7 @@ sub search {
 
   $form->get_lists("projects" => { "key" => "ALL_PROJECTS",
                                    "all" => 1 },
+                   "employees" => "ALL_EMPLOYEES",          
                    $vc => "ALL_" . uc($vc));
 
   my %labels = ();
@@ -1398,24 +1399,40 @@ sub search {
     NTI($cgi->popup_menu('-name' => 'project_id', '-values' => \@values,
                          '-labels' => \%labels));
 
+  #employees
+  %labels = ();
+  @values = ();
+  foreach my $item (@{ $form->{"ALL_EMPLOYEES"} }) {
+    push(@values, $item->{"id"});
+    $labels{$item->{"id"}} = $item->{"name"} ne "" ? $item->{"name"} : $item->{"login"};
+  }
+
+  my $employee = qq|
+    <tr>
+      <th align="right">| . $locale->text('Employee') . qq|</th>
+      <td>| .
+        NTI($cgi->popup_menu('-name' => 'employee_id', '-default' => $form->{"employee_id"},
+                             '-values' => \@values, '-labels' => \%labels)) . qq|
+      </td>
+    </tr>|;
+
   %labels = ();
   @values = ("");
 
   foreach my $item (@{ $form->{($form->{vc} eq "customer" ? "ALL_CUSTOMERS" : "ALL_VENDORS")}}) {
     push(@values, $item->{name}.qq|--|.$item->{"id"});
-    $labels{$item->{"id"}} = $item->{name}.qq|--|.$item->{"id"};
+    $labels{$item->{name}.qq|--|.$item->{"id"}} = $item->{"name"};
   }
 
   my $vc_label = $form->{vc} eq "customer" ? $locale->text('Customer') : $locale->text('Vendor');
   $vc =
     $myconfig{vclimit} <=  scalar(@values)
-    ? qq|<input type="text" value="| . H($form->{"old$form->{vc}"}) . qq|" name="$form->{vc}">|
+    ? qq|<input type="text" value="| . H(($form->{"old$form->{vc}"} =~ /^(.*)\-\-.*$/)) . qq|" name="$form->{vc}">| 
     : NTI($cgi->popup_menu('-name' => "$form->{vc}",
                            '-default' => $form->{"old$form->{vc}"},
                            '-onChange' => 'document.getElementById(\'update_button\').click();',
                            '-values' => \@values,
                            '-labels' => \%labels));
-
   $form->header;
 
   print qq|
@@ -1440,6 +1457,7 @@ sub search {
           <th align=right>$ordlabel</th>
           <td colspan=3><input name="$ordnumber" size=20></td>
         </tr>
+  $employee
         <tr>
           <th align="right">| . $locale->text('Transaction description') . qq|</th>
           <td colspan="3"><input name="transaction_description" size=20></td>