From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 14 Nov 2007 08:43:09 +0000 (+0000)
Subject: Der Ertrag ist kein Prozentwert. Zahlen rechtsbündig anordnen.
X-Git-Tag: release-2.6.0beta1~411
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=18f1522d1d7551b0ef0ecaecc0fd4df65352c468;p=kivitendo-erp.git

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 68112fb66..c6d280818 100644
--- a/templates/webpages/oe/orders_footer_de.html
+++ b/templates/webpages/oe/orders_footer_de.html
@@ -28,24 +28,25 @@
 	    </tr>
       </table>
 	  </td>
+[%- IF is_sales %]
           <td>
             <table>
 
-[%- IF is_sales %]
             <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>
-              <td>[% LxERP.format_amount(marge_percent, 2) %] %</td>
+              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+              <td>%</td>
             </tr>
-[%- END %]
 
             <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>
diff --git a/templates/webpages/oe/orders_footer_master.html b/templates/webpages/oe/orders_footer_master.html
index 23b2cf2d4..64d0b0b45 100644
--- a/templates/webpages/oe/orders_footer_master.html
+++ b/templates/webpages/oe/orders_footer_master.html
@@ -28,24 +28,25 @@
 	    </tr>
       </table>
 	  </td>
+[%- IF is_sales %]
           <td>
             <table>
 
-[%- IF is_sales %]
             <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>
-              <td>[% LxERP.format_amount(marge_percent, 2) %] %</td>
+              <td align="right">[% LxERP.format_amount(marge_percent, 2) %]</td>
+              <td>%</td>
             </tr>
-[%- END %]
 
             <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>