Bugfix: subtotal wurde nicht ans template weitergereicht.

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 41b290a3b7502678027414f35c588d56afec3b9b..421c76ef26f02cfc26f7a6024f38de30bacccf1c 100644 (file)
--- 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}) {
 
   } 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 9785de14c119c54911fd9d8fe9e0ffca4989e436..06c0a2855f0d26f58f242d08f9170410250a657a 100644 (file)
--- 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>
             <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>
               [% 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 e866ff88f7aebc4aff1ced0e3708298492d2ceba..603fc93bd52452f881244102679e7f524f3e13eb 100644 (file)
--- 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>
             <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>
               [% tax %]
               <tr>
                 <th align="right"><translate>Total</translate></th>