X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAR.pm;h=2841743965fc432c39f08ec9a3b558ca9fa775ca;hb=d56c9b0850c73bceeeadc534836c8164928cff71;hp=81be410e819f7d490d57c233be811c26a37aa2e0;hpb=a87694dc525b4eabff11029f1e5401621e2bd3bc;p=kivitendo-erp.git

diff --git a/SL/AR.pm b/SL/AR.pm
index 81be410e8..284174396 100644
--- a/SL/AR.pm
+++ b/SL/AR.pm
@@ -458,15 +458,16 @@ sub ar_transactions {
   my $query =
     qq|SELECT DISTINCT a.id, a.invnumber, a.ordnumber, a.cusordnumber, a.transdate, | .
     qq|  a.duedate, a.netamount, a.amount, a.paid, | .
-    qq|  a.invoice, a.datepaid, a.terms, a.notes, a.shipvia, | .
+    qq|  a.invoice, a.datepaid, a.notes, a.shipvia, | .
     qq|  a.shippingpoint, a.storno, a.storno_id, a.globalproject_id, | .
     qq|  a.marge_total, a.marge_percent, | .
-    qq|  a.transaction_description, | .
+    qq|  a.transaction_description, a.direct_debit, | .
     qq|  pr.projectnumber AS globalprojectnumber, | .
     qq|  c.name, c.customernumber, c.country, c.ustid, b.description as customertype, | .
     qq|  c.id as customer_id, | .
     qq|  e.name AS employee, | .
     qq|  e2.name AS salesman, | .
+    qq|  dc.dunning_description, | .
     qq|  tz.description AS taxzone, | .
     qq|  pt.description AS payment_terms, | .
     qq{  ( SELECT ch.accno || ' -- ' || ch.description
@@ -481,6 +482,7 @@ sub ar_transactions {
     qq|LEFT JOIN contacts cp ON (a.cp_id = cp.cp_id) | .
     qq|LEFT JOIN employee e ON (a.employee_id = e.id) | .
     qq|LEFT JOIN employee e2 ON (a.salesman_id = e2.id) | .
+    qq|LEFT JOIN dunning_config dc ON (a.dunning_config_id = dc.id) | .
     qq|LEFT JOIN project pr ON (a.globalproject_id = pr.id)| .
     qq|LEFT JOIN tax_zones tz ON (tz.id = a.taxzone_id)| .
     qq|LEFT JOIN payment_terms pt ON (pt.id = a.payment_id)| .
@@ -549,6 +551,14 @@ sub ar_transactions {
     $where .= " AND a.transdate <= ?";
     push(@values, $form->{transdateto});
   }
+  if ($form->{duedatefrom}) {
+    $where .= " AND a.duedate >= ?";
+    push(@values, $form->{duedatefrom});
+  }
+  if ($form->{duedateto}) {
+    $where .= " AND a.duedate <= ?";
+    push(@values, $form->{duedateto});
+  }
   if ($form->{open} || $form->{closed}) {
     unless ($form->{open} && $form->{closed}) {
       $where .= " AND a.amount <> a.paid" if ($form->{open});