From 38e2fd55ba06b7dbc7a44a72108e3870a44825eb Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 16 May 2012 18:47:25 +0200
Subject: [PATCH] [IMP] Improved sale order form view subtotal look

bzr revid: fme@openerp.com-20120516164725-kcw2e2x0asjlmfha
---
 addons/sale/sale_view.xml               | 10 +++++++---
 addons/sale_margin/sale_margin_view.xml |  8 +++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c6dab2fa6c4..eef3713fcb4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -206,12 +206,16 @@
                                 </tree>
                             </field>
 
-                            <div class="oe_right">
-                                <group col="2">
+                            <div class="oe_form_subtotal_footer" colspan="4">
+                                <div>
                                     <field name="amount_untaxed" sum="Untaxed amount"/>
+                                </div>
+                                <div>
                                     <field name="amount_tax"/>
+                                </div>
+                                <div class="oe_form_subtotal_footer_separator">
                                     <field name="amount_total"/>
-                                </group>
+                                </div>
                             </div>
                             <div class="oe_clear"/>
 
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index ad0b8440f19..a0b8f39565c 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,9 +8,11 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <field name="amount_total" position="after">
-                <field name="margin"/>
-            </field>
+            <xpath expr="//div[@class='oe_form_subtotal_footer_separator']" position="after">
+                <div>
+                    <field name="margin"/>
+                </div>
+            </xpath>
         </field>
     </record>