From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 28 Sep 2012 10:54:58 +0000 (+0200)
Subject: Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
X-Git-Tag: release-3.0.0beta1~225^2~11
X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/commitdiff_plain/56999db7bdaa9dec5af256c8094095cc9af2e8a4?hp=c979fc6c1783358ad77adb4003c6f3755e92547b

Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
---

diff --git a/SL/IS.pm b/SL/IS.pm
index 82226ee52..266e05299 100644
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -258,8 +258,7 @@ sub invoice_details {
         $subtotal_header     = 0;
 
       } else {
-        push @{ $form->{TEMPLATE_ARRAYS}->{discount_sub} },   "";
-        push @{ $form->{TEMPLATE_ARRAYS}->{nodiscount_sub} }, "";
+        push @{ $form->{TEMPLATE_ARRAYS}->{$_} }, "" for qw(discount_sub nodiscount_sub discount_sub_nofmt nodiscount_sub_nofmt);
       }
 
       if (!$form->{"discount_$i"}) {
diff --git a/SL/OE.pm b/SL/OE.pm
index bdff8cb6b..6648e2242 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1218,8 +1218,7 @@ sub order_details {
         $subtotal_header     = 0;
 
       } else {
-        push @{ $form->{TEMPLATE_ARRAYS}->{discount_sub} },   "";
-        push @{ $form->{TEMPLATE_ARRAYS}->{nodiscount_sub} }, "";
+        push @{ $form->{TEMPLATE_ARRAYS}->{$_} }, "" for qw(discount_sub nodiscount_sub discount_sub_nofmt nodiscount_sub_nofmt);
       }
 
       if (!$form->{"discount_$i"}) {