Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 7fe03300

Von Moritz Bunkus vor mehr als 14 Jahren hinzugefügt

  • ID 7fe033004020c39c4410d9ef5e31320e31b4dae0
  • Vorgänger 92d28f85
  • Nachfolger b68c23bf

Anzeige des offenen Rechnungsbetrags in Spalte im Mahnprozess

Fix für Bug 1355

Unterschiede anzeigen:

SL/DN.pm
469 469
    qq|SELECT
470 470
         a.id, a.ordnumber, a.transdate, a.invnumber, a.amount,
471 471
         ct.name AS customername, a.customer_id, a.duedate,
472
         a.amount - a.paid AS open_amount,
472 473

  
473 474
         cfg.dunning_description, cfg.dunning_level,
474 475

  
bin/mozilla/dn.pl
132 132
    if ($row->{next_dunning_config_id}) {
133 133
      map { $_->{SELECTED} = $_->{id} == $row->{next_dunning_config_id} } @{ $row->{DUNNING_CONFIG } };
134 134
    }
135
    map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount fee interest);
135
    map { $row->{$_} = $form->format_amount(\%myconfig, $row->{$_} * 1, -2) } qw(amount open_amount fee interest);
136 136
  }
137 137

  
138 138
  $form->get_lists('printers'  => 'printers',
locale/de/all
1098 1098
  'One or more Perl modules missing' => 'Ein oder mehr Perl-Module fehlen',
1099 1099
  'Only due follow-ups'         => 'Nur fällige Wiedervorlagen',
1100 1100
  'Open'                        => 'Offen',
1101
  'Open Amount'                 => 'Offener Betrag',
1101 1102
  'Open amount'                 => 'offener Betrag',
1102 1103
  'OpenDocument/OASIS'          => 'OpenDocument/OASIS',
1103 1104
  'Openings'                    => '?ffnungszeiten',
templates/webpages/dunning/show_invoices_de.html
27 27
   <th class="listheading">Rechnungsdatum</th>
28 28
   <th class="listheading">Rg. F?lligkeit</th>
29 29
   <th class="listheading">Betrag</th>
30
   <th class="listheading">Offener Betrag</th>
30 31
   <th class="listheading">Zahlbar bis</th>
31 32
   <th class="listheading">Kumulierte Geb?hren</th>
32 33
   <th class="listheading">Zinsen</th>
......
58 59
     <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
59 60
     <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
60 61
     <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
62
     <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>
61 63
     <td>[% HTML.escape(row.next_duedate) %]</td>
62 64
     <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
63 65
     <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>
templates/webpages/dunning/show_invoices_master.html
29 29
   <th class="listheading"><translate>Invdate</translate></th>
30 30
   <th class="listheading"><translate>Inv. Duedate</translate></th>
31 31
   <th class="listheading"><translate>Amount</translate></th>
32
   <th class="listheading"><translate>Open Amount</translate></th>
32 33
   <th class="listheading"><translate>Dunning Duedate</translate></th>
33 34
   <th class="listheading"><translate>Total Fees</translate></th>
34 35
   <th class="listheading"><translate>Interest</translate></th>
......
60 61
     <td><input type="hidden" name="invdate_[% loop.count %]" size="6" value="[% HTML.escape(row.transdate) %]">[% HTML.escape(row.transdate) %]</td>
61 62
     <td><input type="hidden" name="inv_duedate_[% loop.count %]" size="6" value="[% HTML.escape(row.duedate) %]">[% HTML.escape(row.duedate) %]</td>
62 63
     <td align="right"><input type="hidden" name="amount_[% loop.count %]" size="6" value="[% HTML.escape(row.amount) %]">[% HTML.escape(row.amount) %]</td>
64
     <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>
63 65
     <td>[% HTML.escape(row.next_duedate) %]</td>
64 66
     <td align="right"><input type="hidden" name="fee_[% loop.count %]" size="6" value="[% HTML.escape(row.fee) %]">[% HTML.escape(row.fee) %]</td>
65 67
     <td align="right"><input type="hidden" name="interest_[% loop.count %]" size="6" value="[% HTML.escape(row.interest) %]">[% HTML.escape(row.interest) %]</td>

Auch abrufbar als: Unified diff