Anzeige des offenen Rechnungsbetrags in Spalte im Mahnprozess

Fix für Bug 1355

diff --git a/SL/DN.pm b/SL/DN.pm
index 0e378d69db07330d42f1516ab07ab59f5a2c639c..5cf42b543870268df5b12b42c3e8514613286635 100644 (file)
--- a/SL/DN.pm
+++ b/SL/DN.pm
@@ -469,6 +469,7 @@ sub get_invoices {
     qq|SELECT
          a.id, a.ordnumber, a.transdate, a.invnumber, a.amount,
          ct.name AS customername, a.customer_id, a.duedate,
     qq|SELECT
          a.id, a.ordnumber, a.transdate, a.invnumber, a.amount,
          ct.name AS customername, a.customer_id, a.duedate,

+         a.amount - a.paid AS open_amount,

 
          cfg.dunning_description, cfg.dunning_level,
 
 
          cfg.dunning_description, cfg.dunning_level,
 

diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl
index cf85bf5153756aa2d97addd9cbac311d6c13b6f1..845d2cd64bb063af2aaa4b0ce49c827496b34096 100644 (file)
--- a/bin/mozilla/dn.pl
+++ b/bin/mozilla/dn.pl
@@ -132,7 +132,7 @@ sub show_invoices {
     if ($row->{next_dunning_config_id}) {
       map { $_->{SELECTED} = $_->{id} == $row->{next_dunning_config_id} } @{ $row->{DUNNING_CONFIG } };
     }
     if ($row->{next_dunning_config_id}) {
       map { $_->{SELECTED} = $_->{id} == $row->{next_dunning_config_id} } @{ $row->{DUNNING_CONFIG } };
     }

-    map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount fee interest);
+    map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount open_amount fee interest);

   }
 
   $form->get_lists('printers'  => 'printers',
   }
 
   $form->get_lists('printers'  => 'printers',

diff --git a/locale/de/all b/locale/de/all
index 2406b5413725b470f30aab4f6518192feb261183..4d3e0395953ddb1a58ea69ab0eb289f3cd1d718e 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1098,6 +1098,7 @@ $self->{texts} = {
   'One or more Perl modules missing' => 'Ein oder mehr Perl-Module fehlen',
   'Only due follow-ups'         => 'Nur fällige Wiedervorlagen',
   'Open'                        => 'Offen',
   'One or more Perl modules missing' => 'Ein oder mehr Perl-Module fehlen',
   'Only due follow-ups'         => 'Nur fällige Wiedervorlagen',
   'Open'                        => 'Offen',

+  'Open Amount'                 => 'Offener Betrag',

   'Open amount'                 => 'offener Betrag',
   'OpenDocument/OASIS'          => 'OpenDocument/OASIS',
   'Openings'                    => 'Öffnungszeiten',
   'Open amount'                 => 'offener Betrag',
   'OpenDocument/OASIS'          => 'OpenDocument/OASIS',
   'Openings'                    => 'Öffnungszeiten',

diff --git a/templates/webpages/dunning/show_invoices_de.html b/templates/webpages/dunning/show_invoices_de.html
index 89fb48f06a06727575ceaef79ef0b31529ea7d04..5dbb0d5174fb84d00b52d3660fb15d250dce455a 100644 (file)
--- a/templates/webpages/dunning/show_invoices_de.html
+++ b/templates/webpages/dunning/show_invoices_de.html
@@ -27,6 +27,7 @@
    <th class="listheading">Rechnungsdatum</th>
    <th class="listheading">Rg. Fälligkeit</th>
    <th class="listheading">Betrag</th>
    <th class="listheading">Rechnungsdatum</th>
    <th class="listheading">Rg. Fälligkeit</th>
    <th class="listheading">Betrag</th>

+   <th class="listheading">Offener Betrag</th>

    <th class="listheading">Zahlbar bis</th>
    <th class="listheading">Kumulierte Gebühren</th>
    <th class="listheading">Zinsen</th>
    <th class="listheading">Zahlbar bis</th>
    <th class="listheading">Kumulierte Gebühren</th>
    <th class="listheading">Zinsen</th>


@@ -58,6 +59,7 @@
      <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
      <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
      <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
      <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
      <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
      <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>

+     <td align="right"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>

      <td>[% HTML.escape(row.next_duedate) %]</td>
      <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
      <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
      <td>[% HTML.escape(row.next_duedate) %]</td>
      <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
      <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>

diff --git a/templates/webpages/dunning/show_invoices_master.html b/templates/webpages/dunning/show_invoices_master.html
index 583954e7fe45b038080d8a8933352786e91e1455..cdb8c2d4689010d30ef3fd92db06c55e7a3472e1 100644 (file)
--- a/templates/webpages/dunning/show_invoices_master.html
+++ b/templates/webpages/dunning/show_invoices_master.html
@@ -29,6 +29,7 @@
    <th class="listheading"><translate>Invdate</translate></th>
    <th class="listheading"><translate>Inv. Duedate</translate></th>
    <th class="listheading"><translate>Amount</translate></th>
    <th class="listheading"><translate>Invdate</translate></th>
    <th class="listheading"><translate>Inv. Duedate</translate></th>
    <th class="listheading"><translate>Amount</translate></th>

+   <th class="listheading"><translate>Open Amount</translate></th>

    <th class="listheading"><translate>Dunning Duedate</translate></th>
    <th class="listheading"><translate>Total Fees</translate></th>
    <th class="listheading"><translate>Interest</translate></th>
    <th class="listheading"><translate>Dunning Duedate</translate></th>
    <th class="listheading"><translate>Total Fees</translate></th>
    <th class="listheading"><translate>Interest</translate></th>


@@ -60,6 +61,7 @@
      <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
      <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
      <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
      <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
      <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
      <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>

+     <td align="right"><input type="hidden" name="open_amount_[% loop.count %]" size="6" value="[% HTML.escape(row.open_amount) %]">[% HTML.escape(row.open_amount) %]</td>

      <td>[% HTML.escape(row.next_duedate) %]</td>
      <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
      <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
      <td>[% HTML.escape(row.next_duedate) %]</td>
      <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
      <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>