Bei der Ausgabe der Druckvorschau auf einem Drucker darf die Zeilenanzahl nicht erhöh...

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

diff --git a/SL/OE.pm b/SL/OE.pm
index 201f5b5..32ba235 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -102,6 +102,11 @@ sub transactions {
     push(@values, '%' . $form->{$vc} . '%');
   }
 
+  if ($form->{employee_id}) {
+    $query .= " AND o.employee_id = ?";
+    push @values, conv_i($form->{employee_id});
+  }
+
   if (!$form->{open} && !$form->{closed}) {
     $query .= " AND o.id = 0";
   } elsif (!($form->{open} && $form->{closed})) {
@@ -115,7 +120,7 @@ sub transactions {
   }
 
   if ($form->{$ordnumber}) {
-    $query .= qq| AND $ordnumber ILIKE ?|;
+    $query .= qq| AND o.$ordnumber ILIKE ?|;
     push(@values, '%' . $form->{$ordnumber} . '%');
   }
 
@@ -182,7 +187,7 @@ sub save {
   my $all_units = AM->retrieve_units($myconfig, $form);
   $form->{all_units} = $all_units;
 
-  ($null, $form->{employee_id}) = split /--/, $form->{employee};
+  $form->{employee_id} = (split /--/, $form->{employee})[1] if !$form->{employee_id};
   unless ($form->{employee_id}) {
     $form->get_employee($dbh);
   }