From 1663badaaf6535d4d966f9d812560e41c7016a6d Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 19 Jun 2007 12:17:19 +0000
Subject: [PATCH] =?utf8?q?Mahnungen:=20Neuer=20Variable=20f=C3=BCr=20jede?=
 =?utf8?q?=20Rechnung:=20<%dn=5Flinetotal%>=20als=20f=C3=BCr=20diese=20Rec?=
 =?utf8?q?hnung=20zu=20zahlender=20Betrag=20(offener=20Betrag=20zuz=C3=BCg?=
 =?utf8?q?lich=20Mahngeb=C3=BChren=20und=20Zinsen).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 SL/DN.pm                                  | 5 +++--
 doc/dokumentenvorlagen-und-variablen.html | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/SL/DN.pm b/SL/DN.pm
index 4f0827104..758ddf4fa 100644
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -693,7 +693,8 @@ sub print_dunning {
          ar.transdate,       ar.duedate,      ar.customer_id,
          ar.invnumber,       ar.ordnumber,
          ar.amount,          ar.netamount,    ar.paid,
-         ar.amount - ar.paid AS open_amount
+         ar.amount - ar.paid AS open_amount,
+         ar.amount - ar.paid + da.fee + da.interest AS linetotal
 
        FROM dunning da
        LEFT JOIN dunning_config dcfg ON (dcfg.id = da.dunning_config_id)
@@ -707,7 +708,7 @@ sub print_dunning {
       map({ $form->{"dn_$_"} = []; } keys(%{$ref}));
       $first = 0;
     }
-    map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest);
+    map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest linetotal);
     map { $form->{$_} = $ref->{$_} } keys %$ref;
     map { push @{ $form->{"dn_$_"} }, $ref->{$_}} keys %$ref;
   }
diff --git a/doc/dokumentenvorlagen-und-variablen.html b/doc/dokumentenvorlagen-und-variablen.html
index 986ae971c..c71f5393a 100644
--- a/doc/dokumentenvorlagen-und-variablen.html
+++ b/doc/dokumentenvorlagen-und-variablen.html
@@ -842,7 +842,7 @@ td {
    </tr>
    <tr>
     <td><code>dn_fee</code></td>
-    <td>Kummulative Mahngeb&uuml;hr (ist die gleiche wie f&uuml;r die ganze Mahnung, da die Geb&uuml;hr nur einmal pro Mahnung erhoben wird)</td>
+    <td>Kummulative Mahngeb&uuml;hr</td>
    </tr>
    <tr>
     <td><code>dn_interest</code></td>
@@ -852,6 +852,10 @@ td {
     <td><code>dn_invnumber</code></td>
     <td>Rechnungsnummer</td>
    </tr>
+   <tr>
+    <td><code>dn_linetotal</code></td>
+    <td>Noch zu zahlender Betrag (ergibt sich aus <code>dn_open_amount + dn_fee + dn_interest</code>)</td>
+   </tr>
    <tr>
     <td><code>dn_netamount</code></td>
     <td>Rechnungssumme (netto)</td>
-- 
2.20.1