X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=74fbf36826f7c55c5537d081e4476c8c6683b579;hb=d5e79bebec5059297273a0451b65934264e3da17;hp=c706ee4a21ba67d868e56ebc4f522f51ebe8c76c;hpb=8f98fc19d76ab2d20022b3103ac22618bbde5656;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index c706ee4a2..74fbf3682 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -274,11 +274,11 @@ sub get_invoices { $paymentdate = ($form->{paymentuntil}) ? "'$form->{paymentuntil}'" : current_date; - $query = qq|SELECT a.id, a.ordnumber, a.transdate, a.invnumber,a.amount, ct.name AS customername, a.customer_id, a.duedate,da.fee AS old_fee, dnn.fee as fee, dn.dunning_description, da.transdate AS dunning_date, da.duedate AS dunning_duedate, a.duedate + dnn.terms - current_date AS nextlevel, $paymentdate - a.duedate AS pastdue, dn.dunning_level, current_date + dnn.payment_terms AS next_duedate, dnn.dunning_description AS next_dunning_description, dnn.id AS next_dunning_id, dnn.interest AS interest_rate, dnn.terms + $query = qq|SELECT a.id, a.ordnumber, a.transdate, a.invnumber,a.amount, ct.name AS customername, a.customer_id, a.duedate,da.fee AS old_fee,dnn.active,dnn.email, dnn.fee as fee, dn.dunning_description, da.transdate AS dunning_date, da.duedate AS dunning_duedate, a.duedate + dnn.terms - current_date AS nextlevel, $paymentdate - a.duedate AS pastdue, dn.dunning_level, current_date + dnn.payment_terms AS next_duedate, dnn.dunning_description AS next_dunning_description, dnn.id AS next_dunning_id, dnn.interest AS interest_rate, dnn.terms FROM dunning_config dnn, ar a JOIN customer ct ON (a.customer_id = ct.id) LEFT JOIN dunning_config dn ON (dn.id = a.dunning_id) - LEFT JOIN dunning da ON (da.trans_id=a.id AND dunning_config.dunning_level=da.dunning_level) + LEFT JOIN dunning da ON (da.trans_id=a.id AND dn.dunning_level=da.dunning_level) $where|; my $sth = $dbh->prepare($query);