X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FVK.pm;h=6d7df707a26850458bcf88063081aaa408333988;hb=fee5532a132c44dcfc1743393cba00c8e3397176;hp=f2df17b331874e915c21d7796e5c2bfb534c5eb1;hpb=7b6a3af9cc51b982853b572028acc58c8349e2b6;p=kivitendo-erp.git

diff --git a/SL/VK.pm b/SL/VK.pm
index f2df17b33..6d7df707a 100644
--- a/SL/VK.pm
+++ b/SL/VK.pm
@@ -50,9 +50,14 @@ sub invoice_transactions {
 
   my @values;
 
+  # default usage: always use parts.description for (sub-)totalling and in header and subheader lines
+  # but use invoice.description in article mode
+  # so we extract both versions in our query and later overwrite the description in article mode
+
   my $query =
-    qq|SELECT ct.id as customerid, ct.name as customername,ct.customernumber,ct.country,ar.invnumber,ar.id,ar.transdate,p.partnumber,pg.partsgroup,i.parts_id,i.qty,i.price_factor,i.discount,i.description as description,i.lastcost,i.sellprice,i.fxsellprice,i.marge_total,i.marge_percent,i.unit,b.description as business,e.name as employee,e2.name as salesman, to_char(ar.transdate,'Month') as month, to_char(ar.transdate, 'YYYYMM') as nummonth, p.unit as parts_unit | .
-    qq|FROM invoice i | .  
+    qq|SELECT ct.id as customerid, ct.name as customername,ct.customernumber,ct.country,ar.invnumber,ar.id,ar.transdate,p.partnumber,p.description as description, pg.partsgroup,i.parts_id,i.qty,i.price_factor,i.discount,i.description as invoice_description,i.lastcost,i.sellprice,i.fxsellprice,i.marge_total,i.marge_percent,i.unit,b.description as business,e.name as employee,e2.name as salesman, to_char(ar.transdate,'Month') as month, to_char(ar.transdate, 'YYYYMM') as nummonth, p.unit as parts_unit, p.weight, ar.taxincluded | .
+    qq|, COALESCE((SELECT e.buy FROM exchangerate e WHERE e.transdate = ar.transdate and ar.currency_id = e.currency_id),1) as exchangerate | .
+    qq|FROM invoice i | .
     qq|JOIN ar on (i.trans_id = ar.id) | .
     qq|JOIN parts p on (i.parts_id = p.id) | .
     qq|LEFT JOIN partsgroup pg on (p.partsgroup_id = pg.id) | .
@@ -105,7 +110,10 @@ sub invoice_transactions {
   if ($form->{customer_id}) {
     $where .= " AND ar.customer_id = ?";
     push(@values, $form->{customer_id});
-  };
+  } elsif ($form->{customer}) {
+    $where .= " AND ct.name ILIKE ?";
+    push(@values, $form->like($form->{customer}));
+  }
   if ($form->{customernumber}) {
     $where .= qq| AND ct.customernumber = ? |;
     push(@values, $form->{customernumber});
@@ -122,9 +130,12 @@ sub invoice_transactions {
     $where .= qq| AND (ct.country ILIKE ?)|;
     push(@values, '%' . $form->{country} . '%');
   }
-  # nimmt man description am Besten aus invoice oder parts?
+
+  # when filtering for parts by description we probably want to filter by the description of the part as per the master data
+  # invoice.description may differ due to manually changing the description in the invoice or because of translations of the description
+  # at least in the translation case we probably want the report to also include translated articles, so we have to filter via parts.description
   if ($form->{description}) {
-    $where .= qq| AND (i.description ILIKE ?)|;
+    $where .= qq| AND (p.description ILIKE ?)|;
     push(@values, '%' . $form->{description} . '%');
   }
   if ($form->{transdatefrom}) {
@@ -157,7 +168,7 @@ sub invoice_transactions {
     push(@values, $form->{"project_id"}, $form->{"project_id"});
   }
   if ($form->{business_id}) {
-    $where .= qq| AND ct.business_id = ? |; 
+    $where .= qq| AND ct.business_id = ? |;
     push(@values, $form->{"business_id"});
   }
 
@@ -179,7 +190,7 @@ sub invoice_transactions {
     $where .= qq| AND ($cvar_where_ic)|;
     push @values, @cvar_values_ic;
   }
-  
+
   $query .= " WHERE $where ORDER BY $sortorder "; # LIMIT 5000";
 
   my @result = selectall_hashref_query($form, $dbh, $query, @values);