From 0873f5d6f0e703713399ed2577c4500b77eb63bd Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Tue, 5 Jun 2012 13:42:50 +0200
Subject: [PATCH] [IMP] Improved sale order form view

bzr revid: fme@openerp.com-20120605114250-af29l55ak0vqfwri
---
 addons/sale/sale_view.xml               | 21 ++++++++-------------
 addons/sale_margin/sale_margin_view.xml |  8 +++-----
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 6c69dd38a75..c1f81cf521d 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -135,6 +135,7 @@
                     </group>
                     <notebook colspan="5">
                         <page string="Sales Order">
+                        <group col="4">
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />
                             <field domain="[('parent_id','=',partner_id)]" name="partner_invoice_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
                             <field domain="[('parent_id','=',partner_id)]" name="partner_shipping_id" groups="sale.group_delivery_invoice_address" options='{"quick_create": false}'/>
@@ -211,23 +212,17 @@
                                     <field name="price_subtotal" groups="base.group_sale_notes_subtotal"/>
                                 </tree>
                             </field>
-                            <group colspan="2" col="4" name="bellow_the_lines_hook">
+                            <group colspan="3" col="4" name="bellow_the_lines_hook">
+                            </group>
+                            <group class="oe_form_subtotal_footer" colspan="1" col="2">
+                                <field name="amount_untaxed" sum="Untaxed amount"/>
+                                <field name="amount_tax"/>
+                                <field name="amount_total" class="oe_form_subtotal_footer_separator"/>
                             </group>
-                            <div class="oe_form_subtotal_footer" colspan="2">
-                                <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"/>
-                                </div>
-                            </div>
-                            <div class="oe_clear"/>
 
                             <separator colspan="4" string="Notes"/>
                             <field colspan="4" name="note" nolabel="1" placeholder="Our quotation is valid for 30 days..."/>
+                        </group>
                         </page>
                         <page string="Other Information">
                             <group colspan="2" col="2" name="logistics">
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index a0b8f39565c..ad0b8440f19 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,11 +8,9 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@class='oe_form_subtotal_footer_separator']" position="after">
-                <div>
-                    <field name="margin"/>
-                </div>
-            </xpath>
+            <field name="amount_total" position="after">
+                <field name="margin"/>
+            </field>
         </field>
     </record>