X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FOE.pm;h=32ba235d9f93cd6088fd99914f3fa9e87ed26ab2;hb=7783c24d2a5f3f7413dc18d5b96b8a98995ac7da;hp=8e0cfb955dba14fb2ca6817048ddf4313132f65c;hpb=ddbe3ea5ec297a58acc9ee3afc17156fb97be7f2;p=kivitendo-erp.git

diff --git a/SL/OE.pm b/SL/OE.pm
index 8e0cfb955..32ba235d9 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -66,6 +66,7 @@ sub transactions {
     qq|SELECT o.id, o.ordnumber, o.transdate, o.reqdate, | .
     qq|  o.amount, ct.name, o.netamount, o.${vc}_id, o.globalproject_id, | .
     qq|  o.closed, o.delivered, o.quonumber, o.shippingpoint, o.shipvia, | .
+    qq|  o.transaction_description, | .
     qq|  ex.$rate AS exchangerate, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  e.name AS employee | .
@@ -101,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})) {
@@ -114,7 +120,7 @@ sub transactions {
   }
 
   if ($form->{$ordnumber}) {
-    $query .= qq| AND $ordnumber ILIKE ?|;
+    $query .= qq| AND o.$ordnumber ILIKE ?|;
     push(@values, '%' . $form->{$ordnumber} . '%');
   }
 
@@ -128,6 +134,11 @@ sub transactions {
     push(@values, conv_date($form->{transdateto}));
   }
 
+  if ($form->{transaction_description}) {
+    $query .= qq| AND o.transaction_description ILIKE ?|;
+    push(@values, '%' . $form->{transaction_description} . '%');
+  }
+
   my $sortorder = join(', ', ("o.id", $form->sort_columns("transdate", $ordnumber, "name")));
   my %allowed_sort_columns =
     ("transdate" => "o.transdate",
@@ -137,7 +148,8 @@ sub transactions {
      "quonumber" => "o.quonumber",
      "name" => "ct.name",
      "employee" => "e.name",
-     "shipvia" => "o.shipvia");
+     "shipvia" => "o.shipvia",
+     "transaction_description" => "o.transaction_description");
   if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
     $sortorder = $allowed_sort_columns{$form->{sort}};
   }
@@ -175,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);
   }
@@ -407,7 +419,7 @@ Message: $form->{message}\r| if $form->{message};
     qq|shippingpoint = ?, shipvia = ?, notes = ?, intnotes = ?, curr = ?, closed = ?, | .
     qq|delivered = ?, proforma = ?, quotation = ?, department_id = ?, language_id = ?, | .
     qq|taxzone_id = ?, shipto_id = ?, payment_id = ?, delivery_vendor_id = ?, delivery_customer_id = ?, | .
-    qq|globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ? | .
+    qq|globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ? | .
     qq|WHERE id = ?|;
 
   @values = ($form->{ordnumber}, $form->{quonumber},
@@ -425,6 +437,7 @@ Message: $form->{message}\r| if $form->{message};
              conv_i($form->{delivery_customer_id}),
              conv_i($form->{globalproject_id}), conv_i($form->{employee_id}),
              conv_i($form->{salesman_id}), conv_i($form->{cp_id}),
+             $form->{transaction_description},
              conv_i($form->{id}));
   do_query($form, $dbh, $query, @values);
 
@@ -669,7 +682,7 @@ sub retrieve {
       qq|  o.closed, o.reqdate, o.quonumber, o.department_id, o.cusordnumber, | .
       qq|  d.description AS department, o.payment_id, o.language_id, o.taxzone_id, | .
       qq|  o.delivery_customer_id, o.delivery_vendor_id, o.proforma, o.shipto_id, | .
-      qq|  o.globalproject_id, o.delivered | .
+      qq|  o.globalproject_id, o.delivered, o.transaction_description | .
       qq|FROM oe o | .
       qq|JOIN ${vc} cv ON (o.${vc}_id = cv.id) | .
       qq|LEFT JOIN employee e ON (o.employee_id = e.id) | .