Mahnungen: Neuer Variable für jede Rechnung: <%dn_linetotal%> als für diese Rechnung...

diff --git a/SL/DN.pm b/SL/DN.pm
index 4f0827104b2f69d473829baec928f158c6988d62..758ddf4faecffb258c02b6cbd78f98cd6611032c 100644 (file)
--- 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.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)
 
        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({ $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;
   }
     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 986ae971ccdf3b940f6d86b104fc61b11c458339..c71f5393abf48a8e7dcce817030e7f22997d9792 100644 (file)
--- 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>
    </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>
    </tr>
    <tr>
     <td><code>dn_interest</code></td>


@@ -852,6 +852,10 @@ td {
     <td><code>dn_invnumber</code></td>
     <td>Rechnungsnummer</td>
    </tr>
     <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>
    <tr>
     <td><code>dn_netamount</code></td>
     <td>Rechnungssumme (netto)</td>