From 7743b3ab885b485ae317338c55da427b62ab457d Mon Sep 17 00:00:00 2001 From: Philip Reetz Date: Mon, 12 Feb 2007 11:08:46 +0000 Subject: [PATCH] eMail wird nur angekreuzt wenn email in der Konfiguration gesetzt ist --- SL/DN.pm | 4 ++-- bin/mozilla/dn.pl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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); diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index 2ec5ab005..11e75322d 100644 --- a/bin/mozilla/dn.pl +++ b/bin/mozilla/dn.pl @@ -475,10 +475,10 @@ sub show_invoices { $column_data{dunning_description} = qq|$ref->{dunning_level}: $dunning|; - my $active = "checked"; + my $active = ($ref->{active}) ? "checked" : ""; $column_data{active} = qq||; - my $email = "checked"; + my $email = ($ref->{email}) ? "checked" : ""; $column_data{email} = qq||; $column_data{next_duedate} = qq|$ref->{next_duedate}|; -- 2.20.1