projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
92d28f8
)
Anzeige des offenen Rechnungsbetrags in Spalte im Mahnprozess
author
Moritz Bunkus
<m.bunkus@linet-services.de>
Fri, 5 Mar 2010 13:45:08 +0000
(14:45 +0100)
committer
Moritz Bunkus
<m.bunkus@linet-services.de>
Fri, 5 Mar 2010 13:45:08 +0000
(14:45 +0100)
Fix für Bug 1355
SL/DN.pm
patch
|
blob
|
history
bin/mozilla/dn.pl
patch
|
blob
|
history
locale/de/all
patch
|
blob
|
history
templates/webpages/dunning/show_invoices_de.html
patch
|
blob
|
history
templates/webpages/dunning/show_invoices_master.html
patch
|
blob
|
history
diff --git
a/SL/DN.pm
b/SL/DN.pm
index
0e378d6
..
5cf42b5
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
cf85bf5
..
845d2cd
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
2406b54
..
4d3e039
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
89fb48f
..
5dbb0d5
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
583954e
..
cdb8c2d
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>