From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 22 May 2007 10:45:09 +0000 (+0000)
Subject: Die ausgewiesenen Mahngebühren gelten pro Rechnung, nicht pro erzeugter Mahnung,... 
X-Git-Tag: release-2.4.3^2~273
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=f5ab83507b71d551147835d84ec8317afd2842e9;p=kivitendo-erp.git

Die ausgewiesenen Mahngebühren gelten pro Rechnung, nicht pro erzeugter Mahnung, auch wenn Rechnungen in einer Mahnung zusammengefasst werden.
---

diff --git a/SL/DN.pm b/SL/DN.pm
index 95ff16ac3..f986421f7 100644
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -211,10 +211,9 @@ sub save_dunning {
     qq|SELECT
          cfg.interest_rate, cfg.template AS formname,
          cfg.email_subject, cfg.email_body, cfg.email_attachment,
-         (SELECT fee
+         (SELECT SUM(fee)
           FROM dunning
-          WHERE dunning_id = ?
-          LIMIT 1)
+          WHERE dunning_id = ?)
          AS fee,
          (SELECT SUM(interest)
           FROM dunning
@@ -640,7 +639,11 @@ sub print_dunning {
     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,
+         d.transdate AS dunning_date,
+         (SELECT SUM(fee)
+          FROM dunning
+          WHERE dunning_id = ?)
+         AS fee,
          (SELECT SUM(interest)
           FROM dunning
           WHERE dunning_id = ?)
@@ -656,7 +659,7 @@ sub print_dunning {
        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);
+  $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id, $dunning_id, $dunning_id, $dunning_id);
   map { $form->{$_} = $ref->{$_} } keys %{ $ref };
 
   $form->{interest_rate}     = $form->format_amount($myconfig, $ref->{interest_rate} * 100);