From: Sven Schöling <s.schoeling@linet-services.de>
Date: Wed, 12 Nov 2008 13:15:59 +0000 (+0000)
Subject: Bugfix: subtotal wurde nicht ans template weitergereicht.
X-Git-Tag: release-2.6.0beta2~240
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=44da81735f9d1f9ca2d8c22e230a00b8ef24d17e;p=kivitendo-erp.git

Bugfix: subtotal wurde nicht ans template weitergereicht.
---

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 41b290a3b..421c76ef2 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -420,7 +420,7 @@ sub form_footer {
       }
     }
 
-    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0);
+#    $form->{invsubtotal} = $form->format_amount(\%myconfig, $form->{invsubtotal}, 2, 0); # template does this
 
   } else {
     foreach $item (split / /, $form->{taxaccounts}) {
diff --git a/templates/webpages/oe/form_footer_de.html b/templates/webpages/oe/form_footer_de.html
index 9785de14c..06c0a2855 100644
--- a/templates/webpages/oe/form_footer_de.html
+++ b/templates/webpages/oe/form_footer_de.html
@@ -57,7 +57,12 @@
             <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>
 [%- END %]
             <table>
-              [% subtotal %]
+[%- IF NOT taxincluded %]
+              <tr>
+                <th align='right'>Zwischensumme</th>
+                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
+              </tr>
+[%- END %]
               [% tax %]
               <tr>
                 <th align="right">Summe</th>
diff --git a/templates/webpages/oe/form_footer_master.html b/templates/webpages/oe/form_footer_master.html
index e866ff88f..603fc93bd 100644
--- a/templates/webpages/oe/form_footer_master.html
+++ b/templates/webpages/oe/form_footer_master.html
@@ -57,7 +57,12 @@
             <input name="taxincluded" class="checkbox" type="checkbox" value="1"[% IF taxincluded %] checked[% END %]><b><translate>Tax Included</translate></b><br><br>
 [%- END %]
             <table>
-              [% subtotal %]
+[%- IF NOT taxincluded %]
+              <tr>
+                <th align='right'><translate>Subtotal</translate></th>
+                <td align='right'>[% LxERP.format_amount(invsubtotal, 2) %]</td>
+              </tr>
+[%- END %]
               [% tax %]
               <tr>
                 <th align="right"><translate>Total</translate></th>