X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=b5e231c7b913f92411e386afd0fa0e7ba4f631d5;hb=82574e78712d71f2012bf6257b2740e2732f66cf;hp=cb381591d93914a853ac2ab4073a0577e734cdf0;hpb=164b344bd5b79c4187c3e82dd47a5c9230115650;p=kivitendo-erp.git

diff --git a/SL/Common.pm b/SL/Common.pm
index cb381591d..b5e231c7b 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -51,27 +51,22 @@ sub retrieve_parts {
 
   my (@filter_values, $filter);
 
-  foreach (qw(partnumber description)) {
+  foreach (qw(partnumber description ean)) {
     next unless $form->{$_};
 
     $filter .= qq| AND ($_ ILIKE ?)|;
     push @filter_values, '%' . $form->{$_} . '%';
   }
-$main::lxdebug->dump(0, "assemblies in common", $form->{assemblies});
-$main::lxdebug->dump(0, "no assemblies in common", $form->{no_assemblies});
 
   if ($form->{no_assemblies}) {
     $filter .= qq| AND (NOT COALESCE(assembly, FALSE))|;
   }
   if ($form->{assemblies}) {
-    $filter .= qq| AND assembly=TRUE|;		# alles was assembly ist rausgeben erweiterung für bin/mozilla/wh.pl -> transfer_assembly_update_part 
-# eigentlich möchte ich diesen filter abbilden: 
-# select distinct partnumber  from parts inner join assembly on (parts.id = assembly.id) where assembly='t';
-# und so common ist die anweisung gar nicht. wie wäre es mit auslagern in WH.pm? -> get_all_working_assemblies? jb 21.2.2009
+    $filter .= qq| AND assembly=TRUE|;
   }
 
   if ($form->{no_services}) {
-    $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|; # @mb hier nochmal optimieren ... nach kurzer ruecksprache alles i.o. 
+    $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|; # @mb hier nochmal optimieren ... nach kurzer ruecksprache alles i.o.
   }
 
   substr($filter, 1, 3) = "WHERE" if ($filter);
@@ -80,17 +75,11 @@ $main::lxdebug->dump(0, "no assemblies in common", $form->{no_assemblies});
   $order_dir = $order_dir ? "ASC" : "DESC";
 
   my $query =
-    qq|SELECT id, partnumber, description | .
+    qq|SELECT id, partnumber, description, ean | .
     qq|FROM parts $filter | .
     qq|ORDER BY $order_by $order_dir|;
   my $sth = $dbh->prepare($query);
   $sth->execute(@filter_values) || $form->dberror($query . " (" . join(", ", @filter_values) . ")");
-
-$main::lxdebug->dump(0, "query", $query);
-
-$main::lxdebug->dump(0, "values", @filter_values);
-
-
   my $parts = [];
   while (my $ref = $sth->fetchrow_hashref()) {
     push(@{$parts}, $ref);