From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Tue, 10 May 2011 14:56:02 +0000 (+0200)
Subject: Weitere Rechnungsvariablen ins Ausgabeformat der ausgewählten Sprache umwandeln
X-Git-Tag: release-2.6.3~25^2~67
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5d43bf8ece218fcc326e18b4d2cd6823d351dea1;p=kivitendo-erp.git

Weitere Rechnungsvariablen ins Ausgabeformat der ausgewählten Sprache umwandeln

Fix für Bug 1616.
---

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 3d236e87b..b26bce415 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1538,17 +1538,7 @@ sub print_form {
                    qw(invtotal ordtotal quototal subtotal linetotal
                       listprice sellprice netprice discount
                       tax taxbase total paid),
-                   grep({ /^linetotal_\d+$/ ||
-                            /^listprice_\d+$/ ||
-                            /^sellprice_\d+$/ ||
-                            /^netprice_\d+$/ ||
-                            /^taxbase_\d+$/ ||
-                            /^discount_\d+$/ ||
-                            /^paid_\d+$/ ||
-                            /^subtotal_\d+$/ ||
-                            /^total_\d+$/ ||
-                            /^tax_\d+$/
-                        } keys(%{$form})));
+                   grep({ /^(?:linetotal|nodiscount_linetotal|listprice|sellprice|netprice|taxbase|discount|p_discount|discount_sub|nodiscount_sub|paid|subtotal|total|tax)_\d+$/ } keys(%{$form})));
 
   reformat_numbers($output_numberformat, undef,
                    qw(qty price_factor),