From: Holger Lindemann Date: Thu, 4 Mar 2010 23:24:48 +0000 (+0100) Subject: Merge branch 'master' of ssh://lx-office/~/lx-office-erp X-Git-Tag: release-2.6.1beta1~12^2~4^2 X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/74f7cca442f474aec5bef8ba1453fc9e79c970e2?hp=885e7d7601de767605f2938a69bae18258c62696 Merge branch 'master' of ssh://lx-office/~/lx-office-erp --- diff --git a/SL/DN.pm b/SL/DN.pm index 0e378d69d..5cf42b543 100644 --- 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, + a.amount - a.paid AS open_amount, cfg.dunning_description, cfg.dunning_level, diff --git a/SL/Form.pm b/SL/Form.pm index 8d1772061..c1cc2abb1 100644 --- a/SL/Form.pm +++ b/SL/Form.pm @@ -2576,7 +2576,7 @@ sub all_vc { my ($count) = selectrow_query($self, $dbh, $query); # build selection list - if ($count < $myconfig->{vclimit}) { + if ($count <= $myconfig->{vclimit}) { $query = qq|SELECT id, name, salesman_id FROM $table WHERE NOT obsolete ORDER BY name|; diff --git a/bin/mozilla/dn.pl b/bin/mozilla/dn.pl index cf85bf515..845d2cd64 100644 --- 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 } }; } - 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', diff --git a/doc/changelog b/doc/changelog index 0a867e45d..b52032fa4 100644 --- a/doc/changelog +++ b/doc/changelog @@ -186,7 +186,7 @@ 1110 1118 1125 1127 1130 1133 1135 1136 1138 1144 1146 1147 1150 1151 1155 1164 1170 1173 1177 1186 1188 1190 1191 1195 1197 1198 1199 1200 1201 1209 1213 1243 1248 1250 1262 1286 1287 1289 1290 1291 1294 1299 1331 1334 1336 - 1339 1340 1341 1342 1343 1350 1399 + 1339 1340 1341 1342 1343 1350 1352 1399 2009-06-02 - Version 2.6.0 diff --git a/locale/de/all b/locale/de/all index 2406b5413..4d3e03959 100644 --- 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', + 'Open Amount' => 'Offener Betrag', 'Open amount' => 'offener Betrag', 'OpenDocument/OASIS' => 'OpenDocument/OASIS', 'Openings' => 'Öffnungszeiten', diff --git a/locale/de/rundungsfehler_korrigieren_BUG1328 b/locale/de/rundungsfehler_korrigieren_BUG1328 new file mode 100644 index 000000000..eb6fbd1ee --- /dev/null +++ b/locale/de/rundungsfehler_korrigieren_BUG1328 @@ -0,0 +1,13 @@ +#!/usr/bin/perl + +$self->{texts} = { + 'Database update error:' => 'Fehler beim Datenbankupgrade:', +}; + +$self->{subs} = { + 'do_query' => 'do_query', + 'do_update' => 'do_update', + 'mydberror' => 'mydberror', +}; + +1; diff --git a/templates/webpages/dunning/show_invoices_de.html b/templates/webpages/dunning/show_invoices_de.html index 6d5d9a1ad..5dbb0d517 100644 --- a/templates/webpages/dunning/show_invoices_de.html +++ b/templates/webpages/dunning/show_invoices_de.html @@ -27,6 +27,7 @@ Rechnungsdatum Rg. Fälligkeit Betrag + Offener Betrag Zahlbar bis Kumulierte Gebühren Zinsen @@ -51,10 +52,14 @@ [% HTML.escape(row.customername) %] - [% HTML.escape(row.invnumber) %] + + + [% HTML.escape(row.invnumber) %] + [% HTML.escape(row.transdate) %] [% HTML.escape(row.duedate) %] [% HTML.escape(row.amount) %] + [% HTML.escape(row.open_amount) %] [% HTML.escape(row.next_duedate) %] [% HTML.escape(row.fee) %] [% HTML.escape(row.interest) %] diff --git a/templates/webpages/dunning/show_invoices_master.html b/templates/webpages/dunning/show_invoices_master.html index cc48a459b..cdb8c2d46 100644 --- a/templates/webpages/dunning/show_invoices_master.html +++ b/templates/webpages/dunning/show_invoices_master.html @@ -29,6 +29,7 @@ Invdate Inv. Duedate Amount + Open Amount Dunning Duedate Total Fees Interest @@ -53,10 +54,14 @@ [% HTML.escape(row.customername) %] - [% HTML.escape(row.invnumber) %] + + + [% HTML.escape(row.invnumber) %] + [% HTML.escape(row.transdate) %] [% HTML.escape(row.duedate) %] [% HTML.escape(row.amount) %] + [% HTML.escape(row.open_amount) %] [% HTML.escape(row.next_duedate) %] [% HTML.escape(row.fee) %] [% HTML.escape(row.interest) %] diff --git a/templates/webpages/wh/removal_parts_selection_de.html b/templates/webpages/wh/removal_parts_selection_de.html index 4b771e319..f3a21edc0 100644 --- a/templates/webpages/wh/removal_parts_selection_de.html +++ b/templates/webpages/wh/removal_parts_selection_de.html @@ -22,7 +22,7 @@ Optionaler Kommentar: - +

diff --git a/templates/webpages/wh/removal_parts_selection_master.html b/templates/webpages/wh/removal_parts_selection_master.html index 0d4ae59d2..d8e1a4461 100644 --- a/templates/webpages/wh/removal_parts_selection_master.html +++ b/templates/webpages/wh/removal_parts_selection_master.html @@ -22,7 +22,7 @@ Optional comment: - +

diff --git a/templates/webpages/wh/warehouse_selection_stock_de.html b/templates/webpages/wh/warehouse_selection_stock_de.html index d9ce5cba6..9a41c8e39 100644 --- a/templates/webpages/wh/warehouse_selection_stock_de.html +++ b/templates/webpages/wh/warehouse_selection_stock_de.html @@ -121,7 +121,7 @@ Optionaler Kommentar - + diff --git a/templates/webpages/wh/warehouse_selection_stock_master.html b/templates/webpages/wh/warehouse_selection_stock_master.html index 2558429ad..33bcd76b7 100644 --- a/templates/webpages/wh/warehouse_selection_stock_master.html +++ b/templates/webpages/wh/warehouse_selection_stock_master.html @@ -121,7 +121,7 @@ Optional comment - +