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

[kivitendo-erp.git] / SL / Form.pm

diff --git a/SL/Form.pm b/SL/Form.pm
index 3719515..921832e 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 = ?|;
-  ($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();
 }
@@ -1620,6 +1620,18 @@ sub _get_employees {
   $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();
 
@@ -1779,6 +1791,10 @@ sub get_lists {
   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"});
@@ -2480,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();
 }