X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCommon.pm;h=bdc4c5dd6227d5d961f2d2bee0e82ad104c13519;hb=1043d7f814fccf5864e677b1e38577d0a150026c;hp=f42676a70157022affa52290683a27739b030c15;hpb=71b51e70e8a83a4f95863a01b84944bfb1209caf;p=kivitendo-erp.git

diff --git a/SL/Common.pm b/SL/Common.pm
index f42676a70..bdc4c5dd6 100644
--- a/SL/Common.pm
+++ b/SL/Common.pm
@@ -51,7 +51,7 @@ sub retrieve_parts {
 
   my (@filter_values, $filter);
 
-  foreach (qw(partnumber description)) {
+  foreach (qw(partnumber description ean)) {
     next unless $form->{$_};
 
     $filter .= qq| AND ($_ ILIKE ?)|;
@@ -62,15 +62,11 @@ sub retrieve_parts {
     $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 (COALESCE(inventory_accno_id, 0) > 0) AND (COALESCE (assembly, FALSE))|;
-    $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|; # @mb hier nochmal optimieren ...
+    $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);
@@ -79,7 +75,7 @@ sub retrieve_parts {
   $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);
@@ -198,7 +194,7 @@ sub retrieve_customers_or_vendors {
     push(@queries, qq|SELECT
                         c.id, c.name, 0 AS customer_is_vendor,
                         c.street, c.zipcode, c.city,
-                        ct.cp_greeting, ct.cp_title, ct.cp_givenname, ct.cp_name
+                        ct.cp_gender, ct.cp_title, ct.cp_givenname, ct.cp_name
                       FROM customer c
                       LEFT JOIN contacts ct ON (c.id = ct.cp_cv_id)
                       $c_filter|);
@@ -211,7 +207,7 @@ sub retrieve_customers_or_vendors {
     push(@queries, qq|SELECT
                         v.id, v.name, 1 AS customer_is_vendor,
                         v.street, v.zipcode, v.city,
-                        ct.cp_greeting, ct.cp_title, ct.cp_givenname, ct.cp_name
+                        ct.cp_gender, ct.cp_title, ct.cp_givenname, ct.cp_name
                       FROM vendor v
                       LEFT JOIN contacts ct ON (v.id = ct.cp_cv_id)
                       $v_filter|);