X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=95ff16ac3714c271ca1db0878898adc10ab1daa3;hb=6ed3eaf6cdcec633878703161f2d6d886bfe2ac3;hp=b3c5e6a587f454d1d6e07112de3707eaea60cb2e;hpb=7dab0cbdf9c8d9f1463290ad577e90865d632e93;p=kivitendo-erp.git

diff --git a/SL/DN.pm b/SL/DN.pm
index b3c5e6a58..95ff16ac3 100644
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -56,7 +56,7 @@ sub get_config {
 
   foreach my $ref (@{ $form->{DUNNING} }) {
     $ref->{fee} = $form->format_amount($myconfig, $ref->{fee}, 2);
-    $ref->{interest} = $form->format_amount($myconfig, ($ref->{interest} * 100));
+    $ref->{interest_rate} = $form->format_amount($myconfig, ($ref->{interest_rate} * 100));
   }
 
   $dbh->disconnect();
@@ -76,13 +76,13 @@ sub save_config {
 
   for my $i (1 .. $form->{rowcount}) {
     $form->{"fee_$i"} = $form->parse_amount($myconfig, $form->{"fee_$i"}) * 1;
-    $form->{"interest_$i"} = $form->parse_amount($myconfig, $form->{"interest_$i"}) / 100;
+    $form->{"interest_rate_$i"} = $form->parse_amount($myconfig, $form->{"interest_rate_$i"}) / 100;
 
     if (($form->{"dunning_level_$i"} ne "") &&
         ($form->{"dunning_description_$i"} ne "")) {
       @values = (conv_i($form->{"dunning_level_$i"}), $form->{"dunning_description_$i"},
                  $form->{"email_subject_$i"}, $form->{"email_body_$i"},
-                 $form->{"template_$i"}, $form->{"fee_$i"}, $form->{"interest_$i"},
+                 $form->{"template_$i"}, $form->{"fee_$i"}, $form->{"interest_rate_$i"},
                  $form->{"active_$i"} ? 't' : 'f', $form->{"auto_$i"} ? 't' : 'f', $form->{"email_$i"} ? 't' : 'f',
                  $form->{"email_attachment_$i"} ? 't' : 'f', conv_i($form->{"payment_terms_$i"}), conv_i($form->{"terms_$i"}));
       if ($form->{"id_$i"}) {
@@ -90,7 +90,7 @@ sub save_config {
           qq|UPDATE dunning_config SET
                dunning_level = ?, dunning_description = ?,
                email_subject = ?, email_body = ?,
-               template = ?, fee = ?, interest = ?,
+               template = ?, fee = ?, interest_rate = ?,
                active = ?, auto = ?, email = ?,
                email_attachment = ?, payment_terms = ?, terms = ?
              WHERE id = ?|;
@@ -99,7 +99,7 @@ sub save_config {
         $query =
           qq|INSERT INTO dunning_config
                (dunning_level, dunning_description, email_subject, email_body,
-                template, fee, interest, active, auto, email,
+                template, fee, interest_rate, active, auto, email,
                 email_attachment, payment_terms, terms)
              VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|;
       }
@@ -121,66 +121,122 @@ sub save_config {
 sub save_dunning {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $rows, $userspath,$spool, $sendmail) = @_;
+  my ($self, $myconfig, $form, $rows, $userspath, $spool, $sendmail) = @_;
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
   my ($query, @values);
 
+  my ($dunning_id) = selectrow_query($form, $dbh, qq|SELECT nextval('id')|);
+
+  my $q_update_ar = qq|UPDATE ar SET dunning_config_id = ? WHERE id = ?|;
+  my $h_update_ar = prepare_query($form, $dbh, $q_update_ar);
+
+  my $q_insert_dunning =
+    qq|INSERT INTO dunning (dunning_id, dunning_config_id, dunning_level,
+                            trans_id, fee, interest, transdate, duedate)
+       VALUES (?, ?,
+               (SELECT dunning_level FROM dunning_config WHERE id = ?),
+               ?,
+               (SELECT SUM(fee)
+                FROM dunning_config
+                WHERE dunning_level <= (SELECT dunning_level FROM dunning_config WHERE id = ?)),
+               (SELECT (amount - paid) * (current_date - transdate) FROM ar WHERE id = ?)
+                 * (SELECT interest_rate FROM dunning_config WHERE id = ?)
+                 / 360,
+               current_date,
+               current_date + (SELECT payment_terms FROM dunning_config WHERE id = ?))|;
+  my $h_insert_dunning = prepare_query($form, $dbh, $q_insert_dunning);
+
+  my @invoice_ids;
+  my ($next_dunning_config_id, $customer_id);
+  my $send_email = 0;
+
   foreach my $row (@{ $rows }) {
+    push @invoice_ids, $row->{invoice_id};
+    $next_dunning_config_id = $row->{next_dunning_config_id};
+    $customer_id            = $row->{customer_id};
+
+    @values = ($row->{next_dunning_config_id}, $row->{invoice_id});
+    do_statement($form, $h_update_ar, $q_update_ar, @values);
+
+    $send_email |= $row->{email};
+
+    my $next_config_id = conv_i($row->{next_dunning_config_id});
+    my $invoice_id     = conv_i($row->{invoice_id});
 
-    $form->{"interest_$row"} = $form->parse_amount($myconfig,$form->{"interest_$row"});
-    $form->{"fee_$row"} = $form->parse_amount($myconfig,$form->{"fee_$row"});
-    $form->{send_email} = $form->{"email_$row"};
-
-    $query = qq|UPDATE ar SET dunning_id = ? WHERE id = ?|;
-    @values = ($form->{"next_dunning_id_$row"}, $form->{"inv_id_$row"});
-    do_query($form, $dbh, $query, @values);
-    $query =
-      qq|INSERT INTO dunning (dunning_id, dunning_level, trans_id, fee,
-                              interest, transdate, duedate)
-         VALUES (?, (SELECT dunning_level FROM dunning_config WHERE id = ?),
-                 ?, ?, ?, current_date, ?)|;
-    @values = (conv_i($form->{"next_dunning_id_$row"}),
-               conv_i($form->{"next_dunning_id_$row"}),
-               conv_i($form->{"inv_id_$row"}), $form->{"fee_$row"},
-               $form->{"interest_$row"},
-               conv_date($form->{"next_duedate_$row"}));
-    do_query($form, $dbh, $query, @values);
+    @values = ($dunning_id,     $next_config_id, $next_config_id,
+               $invoice_id,     $next_config_id, $invoice_id,
+               $next_config_id, $next_config_id);
+    do_statement($form, $h_insert_dunning, $q_insert_dunning, @values);
   }
 
+  $h_update_ar->finish();
+  $h_insert_dunning->finish();
+
   my $query =
-    qq|SELECT invnumber, ordnumber, customer_id, amount, netamount,
-         ar.transdate, ar.duedate, paid, amount - paid AS open_amount,
-         template AS formname, email_subject, email_body, email_attachment,
-         da.fee, da.interest, da.transdate AS dunning_date,
-         da.duedate AS dunning_duedate
-       FROM ar LEFT JOIN dunning_config ON (dunning_config.id = ar.dunning_id)
-       LEFT JOIN dunning da ON (ar.id = da.trans_id AND dunning_config.dunning_level = da.dunning_level)
+    qq|SELECT
+         ar.invnumber, ar.ordnumber, ar.amount, ar.netamount,
+         ar.transdate, ar.duedate, ar.paid, ar.amount - ar.paid AS open_amount,
+         da.fee, da.interest, da.transdate AS dunning_date, da.duedate AS dunning_duedate
+       FROM ar
+       LEFT JOIN dunning_config cfg ON (cfg.id = ar.dunning_config_id)
+       LEFT JOIN dunning da ON (ar.id = da.trans_id AND cfg.dunning_level = da.dunning_level)
        WHERE ar.id IN (|
-       . join(", ", map("?", @{ $form->{"inv_ids"} })) . qq|)|;
+       . join(", ", map { "?" } @invoice_ids) . qq|)|;
 
-  my $sth = prepare_execute_query($form, $dbh, $query, @{ $form->{"inv_ids"} });
+  my $sth = prepare_execute_query($form, $dbh, $query, @invoice_ids);
   my $first = 1;
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     if ($first) {
       map({ $form->{"dn_$_"} = []; } keys(%{$ref}));
       $first = 0;
     }
+
+    $ref->{interest_rate} = $form->format_amount($myconfig, $ref->{interest_rate} * 100);
     map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest);
-    map { $form->{$_} = $ref->{$_} } keys %$ref;
-    #print(STDERR Dumper($ref));
     map { push(@{ $form->{"dn_$_"} }, $ref->{$_})} keys %$ref;
+    map { $form->{$_} = $ref->{$_} } keys %{ $ref };
   }
   $sth->finish;
 
-  IS->customer_details($myconfig,$form);
-  #print(STDERR Dumper($form->{dn_invnumber}));
-  $form->{templates} = "$myconfig->{templates}";
-
-
+  $query =
+    qq|SELECT id AS customer_id, name, street, zipcode, city, country, department_1, department_2, email
+       FROM customer
+       WHERE id = ?|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $customer_id);
+  map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
-  $form->{language} = $form->get_template_language(\%myconfig);
+  $query =
+    qq|SELECT
+         cfg.interest_rate, cfg.template AS formname,
+         cfg.email_subject, cfg.email_body, cfg.email_attachment,
+         (SELECT fee
+          FROM dunning
+          WHERE dunning_id = ?
+          LIMIT 1)
+         AS fee,
+         (SELECT SUM(interest)
+          FROM dunning
+          WHERE dunning_id = ?)
+         AS total_interest,
+         (SELECT SUM(amount) - SUM(paid)
+          FROM ar
+          WHERE id IN (| . join(", ", map { "?" } @invoice_ids) . qq|))
+         AS total_open_amount
+       FROM dunning_config cfg
+       WHERE id = ?|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id, $dunning_id, @invoice_ids, $next_dunning_config_id);
+  map { $form->{$_} = $ref->{$_} } keys %{ $ref };
+
+  $form->{interest_rate}     = $form->format_amount($myconfig, $ref->{interest_rate} * 100);
+  $form->{fee}               = $form->format_amount($myconfig, $ref->{fee}, 2);
+  $form->{total_interest}    = $form->format_amount($myconfig, $form->round_amount($ref->{total_interest}, 2), 2);
+  $form->{total_open_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{total_open_amount}, 2), 2);
+  $form->{total_amount}      = $form->format_amount($myconfig, $form->round_amount($ref->{fee} + $ref->{total_interest} + $ref->{total_open_amount}, 2), 2);
+
+  $form->{templates}    = "$myconfig->{templates}";
+  $form->{language}     = $form->get_template_language(\%myconfig);
   $form->{printer_code} = $form->get_printer_code(\%myconfig);
 
   if ($form->{language} ne "") {
@@ -207,7 +263,7 @@ sub save_dunning {
     $form->{"IN"} =~ s/html$/odt/;
   }
 
-  if ($form->{"send_email"} && ($form->{email} ne "")) {
+  if ($send_email && ($form->{email} ne "")) {
     $form->{media} = 'email';
   }
 
@@ -233,6 +289,7 @@ sub save_dunning {
     $form->{keep_tmpfile} = 1;
   }
 
+  delete($form->{tmpfile});
   $form->parse_template($myconfig, $userspath);
 
   $dbh->commit;
@@ -250,20 +307,7 @@ sub get_invoices {
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
 
-  my $where =
-    qq| WHERE (a.paid < a.amount)
-          AND (a.duedate < current_date)
-          AND (dnn.id =
-            (SELECT id FROM dunning_config
-             WHERE dunning_level >
-               (SELECT
-                  CASE
-                    WHEN a.dunning_id IS NULL
-                    THEN 0
-                    ELSE (SELECT dunning_level FROM dunning_config WHERE id = a.dunning_id ORDER BY dunning_level LIMIT 1)
-                  END
-                FROM dunning_config LIMIT 1)
-             LIMIT 1)) |;
+  my $where;
   my @values;
 
   $form->{customer_id} = $1 if ($form->{customer} =~ /--(\d+)$/);
@@ -280,7 +324,7 @@ sub get_invoices {
   my %columns = (
     "ordnumber" => "a.ordnumber",
     "invnumber" => "a.invnumber",
-    "notes" => "a.notes",
+    "notes"     => "a.notes",
     );
   foreach my $key (keys(%columns)) {
     next unless ($form->{$key});
@@ -289,7 +333,7 @@ sub get_invoices {
   }
 
   if ($form->{dunning_level}) {
-    $where .= qq| AND a.dunning_id = ?|;
+    $where .= qq| AND nextcfg.id = ?|;
     push(@values, conv_i($form->{dunning_level}));
   }
 
@@ -299,37 +343,57 @@ sub get_invoices {
     push(@values, $form->{minamount});
   }
 
-  $paymentdate = $form->{paymentuntil} ? $dbh->quote($form->{paymentuntil}) :
-    "current_date";
-
   $query =
-    qq|SELECT a.id, a.ordnumber, a.transdate, a.invnumber, a.amount,
+    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 + da.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 (dn.dunning_level = da.dunning_level))
+
+         cfg.dunning_description, cfg.dunning_level,
+
+         d.transdate AS dunning_date, d.duedate AS dunning_duedate,
+         d.fee, d.interest,
+
+         a.duedate + cfg.terms - current_date AS nextlevel,
+         current_date - COALESCE(d.duedate, a.duedate) AS pastdue,
+         current_date + cfg.payment_terms AS next_duedate,
+
+         nextcfg.dunning_description AS next_dunning_description,
+         nextcfg.id AS next_dunning_config_id,
+         nextcfg.terms, nextcfg.active, nextcfg.email
+
+       FROM ar a
+
+       LEFT JOIN customer ct ON (a.customer_id = ct.id)
+       LEFT JOIN dunning_config cfg ON (a.dunning_config_id = cfg.id)
+       LEFT JOIN dunning_config nextcfg ON
+         (nextcfg.id =
+           (SELECT id
+            FROM dunning_config
+            WHERE dunning_level >
+              COALESCE((SELECT dunning_level
+                        FROM dunning_config
+                        WHERE id = a.dunning_config_id
+                        ORDER BY dunning_level DESC
+                        LIMIT 1),
+                       0)
+            LIMIT 1))
+       LEFT JOIN dunning d ON ((d.trans_id = a.id) AND (cfg.dunning_level = d.dunning_level))
+
+       WHERE (a.paid < a.amount)
+         AND (a.duedate < current_date)
+
        $where
-       ORDER BY a.id, transdate, duedate, name|;
 
+       ORDER BY a.id, transdate, duedate, name|;
   my $sth = prepare_execute_query($form, $dbh, $query, @values);
 
   $form->{DUNNINGS} = [];
 
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    $ref->{interest} = ($ref->{amount} * $ref->{pastdue} * $ref->{interest_rate}) / 360;
+    next if !$ref->{terms} || ($ref->{pastdue} < $ref->{terms});
+
     $ref->{interest} = $form->round_amount($ref->{interest}, 2);
-    map({ $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2)} qw(amount fee interest));
-    if ($ref->{pastdue} >= $ref->{terms}) {
-      push(@{ $form->{DUNNINGS} }, $ref);
-    }
+    push(@{ $form->{DUNNINGS} }, $ref);
   }
 
   $sth->finish;
@@ -354,8 +418,6 @@ sub get_dunning {
 
   my @values;
 
-  $form->{customer_id} = $1 if ($form->{customer} =~ /--(\d+)$/);
-
   if ($form->{customer_id}) {
     $where .= qq| AND (a.customer_id = ?)|;
     push(@values, $form->{customer_id});
@@ -365,7 +427,6 @@ sub get_dunning {
     push(@values, '%' . $form->{customer} . '%');
   }
 
-
   my %columns = (
     "ordnumber" => "a.ordnumber",
     "invnumber" => "a.invnumber",
@@ -378,18 +439,23 @@ sub get_dunning {
   }
 
   if ($form->{dunning_level}) {
-    $where .= qq| AND a.dunning_id = ?|;
+    $where .= qq| AND a.dunning_config_id = ?|;
     push(@values, conv_i($form->{dunning_level}));
   }
 
-  $form->{minamount} = $form->parse_amount($myconfig,$form->{minamount});
+  if ($form->{department_id}) {
+    $where .= qq| AND a.department_id = ?|;
+    push @values, conv_i($form->{department_id});
+  }
+
+  $form->{minamount} = $form->parse_amount($myconfig, $form->{minamount});
   if ($form->{minamount}) {
     $where .= qq| AND ((a.amount - a.paid) > ?) |;
     push(@values, $form->{minamount});
   }
 
   if (!$form->{showold}) {
-    $where .= qq| AND (a.amount > a.paid) AND (da.dunning_id = a.dunning_id) |;
+    $where .= qq| AND (a.amount > a.paid) AND (da.dunning_config_id = a.dunning_config_id) |;
   }
 
   if ($form->{transdatefrom}) {
@@ -411,13 +477,14 @@ sub get_dunning {
 
   $query =
     qq|SELECT a.id, a.ordnumber, a.invoice, a.transdate, a.invnumber, a.amount,
-        ct.name AS customername, ct.id AS customer_id, a.duedate, da.fee,
-        da.interest, dn.dunning_description, da.transdate AS dunning_date, da.duedate AS dunning_duedate, da.dunning_id
-      FROM ar a
-      JOIN customer ct ON (a.customer_id = ct.id), dunning da
-      LEFT JOIN dunning_config dn ON (da.dunning_id = dn.id)
-      $where
-      ORDER BY name, a.id|;
+         ct.name AS customername, ct.id AS customer_id, a.duedate, da.fee,
+         da.interest, dn.dunning_description, da.transdate AS dunning_date,
+         da.duedate AS dunning_duedate, da.dunning_id, da.dunning_config_id
+       FROM ar a
+       JOIN customer ct ON (a.customer_id = ct.id), dunning da
+       LEFT JOIN dunning_config dn ON (da.dunning_config_id = dn.id)
+       $where
+       ORDER BY name, a.id|;
 
   $form->{DUNNINGS} = selectall_hashref_query($form, $dbh, $query, @values);
 
@@ -435,12 +502,15 @@ sub parse_strings {
 
   my ($myconfig, $form, $userspath, $string) = @_;
 
+  local (*IN, *OUT);
+
   my $format = $form->{format};
   $form->{format} = "html";
 
   $tmpstring = "parse_string.html";
   $tmpfile = "$myconfig->{templates}/$tmpstring";
-  open(OUT, ">$tmpfile") or $form->error("$tmpfile : $!");
+  open(OUT, ">", $tmpfile) or $form->error("$tmpfile : $!");
+
   print(OUT $string);
   close(OUT);
 
@@ -450,12 +520,8 @@ sub parse_strings {
 
   my $fileid = time;
   $form->{tmpfile} = "$userspath/${fileid}.$tmpstring";
-  $out = $form->{OUT};
-  $form->{OUT} = ">$form->{tmpfile}";
 
-  if ($form->{OUT}) {
-    open(OUT, "$form->{OUT}") or $form->error("$form->{OUT} : $!");
-  }
+  open(OUT, ">", $form->{tmpfile}) or $form->error("$form->{OUT} : $!");
   if (!$template->parse(*OUT)) {
     $form->cleanup();
     $form->error("$form->{IN} : " . $template->get_error());
@@ -463,7 +529,7 @@ sub parse_strings {
 
   close(OUT);
   my $result = "";
-  open(IN, $form->{tmpfile}) or $form->error($form->cleanup . "$form->{tmpfile} : $!");
+  open(IN, "<", $form->{tmpfile}) or $form->error($form->cleanup . "$form->{tmpfile} : $!");
 
   while (<IN>) {
     $result .= $_;
@@ -485,45 +551,34 @@ sub melt_pdfs {
 
   my ($self, $myconfig, $form, $userspath) = @_;
 
-  map({ $_ =~ s|.*/||g; } @{ $form->{DUNNING_PDFS} });
+  local (*IN, *OUT);
 
-  foreach my $file (@{ $form->{DUNNING_PDFS} }) {
-    $inputfiles .= " $userspath/$file ";
-  }
+  # Don't allow access outside of $userspath.
+  map { $_ =~ s|.*/||; } @{ $form->{DUNNING_PDFS} };
 
+  my $inputfiles = join " ", map { "$userspath/$_" } @{ $form->{DUNNING_PDFS} };
   my $outputfile = "$userspath/dunning.pdf";
+
   system("gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=$outputfile $inputfiles");
-  foreach my $file (@{ $form->{DUNNING_PDFS} }) {
-    unlink("$userspath/$file");
-  }
-  $out = "";
 
-  $form->{OUT} = $out;
+  map { unlink("$userspath/$_") } @{ $form->{DUNNING_PDFS} };
 
   my $numbytes = (-s $outputfile);
-  open(IN, $outputfile)
-    or $form->error($self->cleanup . "$outputfile : $!");
+  open(IN, $outputfile) || $form->error($self->cleanup() . "$outputfile : $!");
 
   $form->{copies} = 1 unless $form->{media} eq 'printer';
 
-  chdir("$self->{cwd}");
+  chdir($self->{cwd});
 
   for my $i (1 .. $form->{copies}) {
-    if ($form->{OUT}) {
-      open(OUT, $form->{OUT})
-        or $form->error($form->cleanup . "$form->{OUT} : $!");
-    } else {
-
-      # launch application
-      print qq|Content-Type: Application/PDF
+    # launch application
+    print qq|Content-Type: Application/PDF
 Content-Disposition: attachment; filename="$outputfile"
 Content-Length: $numbytes
 
 |;
 
-      open(OUT, ">-") or $form->error($form->cleanup . "$!: STDOUT");
-
-    }
+    open(OUT, ">-") or $form->error($form->cleanup . "$!: STDOUT");
 
     while (<IN>) {
       print OUT $_;
@@ -535,7 +590,7 @@ Content-Length: $numbytes
   }
 
   close(IN);
-  unlink("$userspath/$outputfile");
+  unlink($outputfile);
 
   $main::lxdebug->leave_sub();
 }
@@ -543,7 +598,7 @@ Content-Length: $numbytes
 sub print_dunning {
   $main::lxdebug->enter_sub();
 
-  my ($self, $myconfig, $form, $dunning_id, $customer_id, $userspath,$spool, $sendmail) = @_;
+  my ($self, $myconfig, $form, $dunning_id, $userspath, $spool, $sendmail) = @_;
   # connect to database
   my $dbh = $form->dbconnect_noauto($myconfig);
 
@@ -552,12 +607,12 @@ sub print_dunning {
          ar.transdate, ar.duedate, paid, amount - paid AS open_amount,
          template AS formname, email_subject, email_body, email_attachment,
          da.fee, da.interest, da.transdate AS dunning_date, da.duedate AS dunning_duedate
-       FROM ar
-       LEFT JOIN dunning_config ON (dunning_config.id = ar.dunning_id)
-       LEFT JOIN dunning da ON ((ar.id = da.trans_id) AND (dunning_config.dunning_level = da.dunning_level))
-       WHERE (ar.dunning_id = ?) AND (customer_id = ?)|;
+       FROM dunning da
+       LEFT JOIN dunning_config ON (dunning_config.id = da.dunning_config_id)
+       LEFT JOIN ar ON (ar.id = da.trans_id)
+       WHERE (da.dunning_id = ?)|;
 
-  my $sth = prepare_execute_query($form, $dbh, $query, $dunning_id, $customer_id);
+  my $sth = prepare_execute_query($form, $dbh, $query, $dunning_id);
   my $first = 1;
   while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
     if ($first) {
@@ -570,7 +625,47 @@ sub print_dunning {
   }
   $sth->finish;
 
-  IS->customer_details($myconfig,$form);
+  $query =
+    qq|SELECT id AS customer_id, name, street, zipcode, city, country, department_1, department_2, email
+       FROM customer
+       WHERE id =
+         (SELECT customer_id
+          FROM dunning d
+          LEFT JOIN ar ON (d.trans_id = ar.id)
+          WHERE d.id = ?)|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id);
+  map { $form->{$_} = $ref->{$_} } keys %{ $ref };
+
+  $query =
+    qq|SELECT
+         cfg.interest_rate, cfg.template AS formname,
+         cfg.email_subject, cfg.email_body, cfg.email_attachment,
+         d.fee, d.transdate AS dunning_date,
+         (SELECT SUM(interest)
+          FROM dunning
+          WHERE dunning_id = ?)
+         AS total_interest,
+         (SELECT SUM(amount) - SUM(paid)
+          FROM ar
+          WHERE id IN
+            (SELECT trans_id
+             FROM dunning
+             WHERE dunning_id = ?))
+         AS total_open_amount
+       FROM dunning d
+       LEFT JOIN dunning_config cfg ON (d.dunning_config_id = cfg.id)
+       WHERE d.dunning_id = ?
+       LIMIT 1|;
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id, $dunning_id, $dunning_id);
+  map { $form->{$_} = $ref->{$_} } keys %{ $ref };
+
+  $form->{interest_rate}     = $form->format_amount($myconfig, $ref->{interest_rate} * 100);
+  $form->{fee}               = $form->format_amount($myconfig, $ref->{fee}, 2);
+  $form->{total_interest}    = $form->format_amount($myconfig, $form->round_amount($ref->{total_interest}, 2), 2);
+  $form->{total_open_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{total_open_amount}, 2), 2);
+  $form->{total_amount}      = $form->format_amount($myconfig, $form->round_amount($ref->{fee} + $ref->{total_interest} + $ref->{total_open_amount}, 2), 2);
+
+
   $form->{templates} = "$myconfig->{templates}";
 
   $form->{language} = $form->get_template_language(\%myconfig);