X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FVK.pm;h=f20414c7fbfa387cc5c03125aaecdb6ffa426f6d;hb=afe7df8b3ebf17140e0d008ebb9852a6e392c3f4;hp=bcc43ad4f318400b20b704890eb243b65c1569bb;hpb=e112111e80aafcd8f3c86b4ba2a5c5fe3db4b5c2;p=kivitendo-erp.git

diff --git a/SL/VK.pm b/SL/VK.pm
index bcc43ad4f..f20414c7f 100644
--- a/SL/VK.pm
+++ b/SL/VK.pm
@@ -53,15 +53,10 @@ sub invoice_transactions {
   # 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
-#    qq| , (SELECT sum(invoice.qty*invoice.sellprice/CASE WHEN price_factor IS NOT NULL THEN price_factor ELSE 1.0 END) FROM invoice where invoice.parts_id = i.parts_id) as "sellpricelinetotal2" | .
 
   my $query =
-    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 |; 
-
-  # debug modus for comparing linetotal according to database and perl
-  $query .= qq| , (i.qty*i.sellprice/CASE WHEN price_factor IS NOT NULL THEN i.price_factor ELSE 1.0 END) as sellpricelinetotal | if $form->{"l_sellpricelinetotal"};  
-
-  $query .=
+    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) | .
@@ -77,7 +72,7 @@ sub invoice_transactions {
   # limits by employees (Bearbeiter), not salesmen!
   if (!$main::auth->assert('sales_all_edit', 1)) {
     $where .= " AND ar.employee_id = (select id from employee where login= ?)";
-    push (@values, $form->{login});
+    push (@values, $::myconfig{login});
   }
 
   # Stornierte Rechnungen und Stornorechnungen in invoice rausfiltern
@@ -115,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});