From: Philip Reetz <p.reetz@linet-services.de>
Date: Mon, 12 Feb 2007 11:08:46 +0000 (+0000)
Subject: eMail wird nur angekreuzt wenn email in der Konfiguration gesetzt ist
X-Git-Tag: release-2.4.2~120
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=7743b3ab885b485ae317338c55da427b62ab457d;p=kivitendo-erp.git

eMail wird nur angekreuzt wenn email in der Konfiguration gesetzt ist
---

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|<td><input type=hidden name=inv_id_$i size=2 value="$ref->{id}"><input type=hidden name=customer_id_$i size=2 value="$ref->{customer_id}">$ref->{dunning_level}:&nbsp;$dunning</td>|;
-    my $active = "checked";
+    my $active = ($ref->{active}) ? "checked" : "";
     $column_data{active} =
       qq|<td><input type=checkbox name=active_$i value=1 $active></td>|;
-    my $email = "checked";
+    my $email = ($ref->{email}) ? "checked" : "";
   $column_data{email} =
     qq|<td><input type=checkbox name=email_$i value=1 $email></td>|;
     $column_data{next_duedate}           = qq|<td><input type=hidden name=next_duedate_$i size=6 value="$ref->{next_duedate}">$ref->{next_duedate}</td>|;