X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FVK.pm;h=c3a2562fd9fcc518fefbb006ad8cd2582e2afbe7;hb=17f2de0a4b8f2fea0b5140d16d345e8ea180c077;hp=458c351583d775622aadf8acc4d8d344a45a3aa5;hpb=57463eed482c9f107a6bb35d8b24d666175570a3;p=kivitendo-erp.git

diff --git a/SL/VK.pm b/SL/VK.pm
index 458c35158..c3a2562fd 100644
--- a/SL/VK.pm
+++ b/SL/VK.pm
@@ -51,7 +51,7 @@ sub invoice_transactions {
   my @values;
 
   my $query =
-    qq|SELECT cus.name,ar.invnumber,ar.id,ar.transdate,p.partnumber,i.parts_id,i.qty,i.price_factor,i.discount,i.description,i.lastcost,i.sellprice,i.marge_total,i.marge_percent,i.unit | .
+    qq|SELECT cus.name,cus.customernumber,ar.invnumber,ar.id,ar.transdate,p.partnumber,i.parts_id,i.qty,i.price_factor,i.discount,i.description,i.lastcost,i.sellprice,i.marge_total,i.marge_percent,i.unit | .
     qq|FROM invoice i | .  
     qq|join ar on (i.trans_id = ar.id) | .
     qq|join parts p on (i.parts_id = p.id) | .
@@ -62,6 +62,9 @@ sub invoice_transactions {
   # Stornierte Rechnungen und Stornorechnungen in invoice rausfiltern
   $where .= " AND ar.storno is not true ";
 
+  # Bestandteile von Erzeugnissen herausfiltern
+  $where .= " AND i.assemblyitem is not true ";
+
   my $sortorder = "cus.name,i.parts_id,ar.transdate";
   if ($form->{sortby} eq 'artikelsort') {
     $sortorder = "i.parts_id,cus.name,ar.transdate";
@@ -71,6 +74,10 @@ sub invoice_transactions {
     $where .= " AND ar.customer_id = ?";
     push(@values, $form->{customer_id});
   };
+  if ($form->{customernumber}) {
+    $where .= qq| AND cus.customernumber = ? |;
+    push(@values, $form->{customernumber});
+  }
   if ($form->{partnumber}) {
     $where .= qq| AND (p.partnumber ILIKE ?)|;
     push(@values, '%' . $form->{partnumber} . '%');