Der Ertrag ist kein Prozentwert. Zahlen rechtsbündig anordnen.

diff --git a/templates/webpages/oe/orders_footer_de.html b/templates/webpages/oe/orders_footer_de.html
index 68112fb660476b70fcb07a7301e957e0f720c34f..c6d28081892e2b01b4331b2dd582c5ca48d0e066 100644 (file)
--- a/templates/webpages/oe/orders_footer_de.html
+++ b/templates/webpages/oe/orders_footer_de.html
@@ -28,24 +28,25 @@
            </tr>
       </table>
          </td>
            </tr>
       </table>
          </td>

+[%- IF is_sales %]

           <td>
             <table>
 
           <td>
             <table>
 

-[%- IF is_sales %]

             <tr>
               <th  align=left>Ertrag</th>
             <tr>
               <th  align=left>Ertrag</th>

-              <td>[% LxERP.format_amount(marge_total, 2) %] %</td>
+              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>

             </tr>
             <tr>
               <th  align=left>Ertrag prozentual</th>
             </tr>
             <tr>
               <th  align=left>Ertrag prozentual</th>

-              <td>[% LxERP.format_amount(marge_percent, 2) %] %</td>
+              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+              <td>%</td>

             </tr>
             </tr>

-[%- END %]

 
             <input type=hidden name="marge_total" value="[% marge_total %]">
             <input type=hidden name="marge_percent" value="[% marge_percent %]">
             </table>
           </td>
 
             <input type=hidden name="marge_total" value="[% marge_total %]">
             <input type=hidden name="marge_percent" value="[% marge_percent %]">
             </table>
           </td>

+[%- END %]

          <td align=right>
 [%- IF taxaccounts %]
             <input name=taxincluded class=checkbox type=checkbox value=1 [% IF taxincluded %]checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>
          <td align=right>
 [%- IF taxaccounts %]
             <input name=taxincluded class=checkbox type=checkbox value=1 [% IF taxincluded %]checked[% END %]><b>Steuer im Preis inbegriffen</b><br><br>

diff --git a/templates/webpages/oe/orders_footer_master.html b/templates/webpages/oe/orders_footer_master.html
index 23b2cf2d45d905430c604074fbc4bb3f7dd21749..64d0b0b4527a8f950bcf63c4c69d329c03076897 100644 (file)
--- a/templates/webpages/oe/orders_footer_master.html
+++ b/templates/webpages/oe/orders_footer_master.html
@@ -28,24 +28,25 @@
            </tr>
       </table>
          </td>
            </tr>
       </table>
          </td>

+[%- IF is_sales %]

           <td>
             <table>
 
           <td>
             <table>
 

-[%- IF is_sales %]

             <tr>
               <th  align=left><translate>Ertrag</translate></th>
             <tr>
               <th  align=left><translate>Ertrag</translate></th>

-              <td>[% LxERP.format_amount(marge_total, 2) %] %</td>
+              <td align="right">[% LxERP.format_amount(marge_total, 2) %]</td>

             </tr>
             <tr>
               <th  align=left><translate>Ertrag prozentual</translate></th>
             </tr>
             <tr>
               <th  align=left><translate>Ertrag prozentual</translate></th>

-              <td>[% LxERP.format_amount(marge_percent, 2) %] %</td>
+              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+              <td>%</td>

             </tr>
             </tr>

-[%- END %]

 
             <input type=hidden name="marge_total" value="[% marge_total %]">
             <input type=hidden name="marge_percent" value="[% marge_percent %]">
             </table>
           </td>
 
             <input type=hidden name="marge_total" value="[% marge_total %]">
             <input type=hidden name="marge_percent" value="[% marge_percent %]">
             </table>
           </td>

+[%- END %]

          <td align=right>
 [%- IF taxaccounts %]
             <input name=taxincluded class=checkbox type=checkbox value=1 [% IF taxincluded %]checked[% END %]><b><translate>Tax Included</translate></b><br><br>
          <td align=right>
 [%- IF taxaccounts %]
             <input name=taxincluded class=checkbox type=checkbox value=1 [% IF taxincluded %]checked[% END %]><b><translate>Tax Included</translate></b><br><br>