From 09701b83acbade29fdebc471730ccbafa4d8c75e Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Fri, 6 Jul 2012 11:32:56 +0530
Subject: [PATCH] [IMP]Sale Quotation : view are improved

bzr revid: hsa@tinyerp.com-20120706060256-ymn92nvfmf1m4ctq
---
 addons/delivery/delivery_view.xml       |  4 ++--
 addons/sale/sale_view.xml               | 12 +++++++-----
 addons/sale_margin/sale_margin_view.xml |  9 +++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 5e54f74f7f1..094bf426e88 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -256,12 +256,12 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='sale_total']" position="after">
+                <xpath expr="//group[@name='sale_delivery']" position="inside">
                     <group>
                         <label for="carrier_id"/>
                         <div>
                             <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
-                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
+                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object" class="oe_inline"/>
                         </div>
                         <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order."/>
                     </group>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index d5d6b5346eb..42a141befd0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -244,6 +244,9 @@
                                             <field colspan="4" name="invoice_lines" nolabel="1"/>
                                             <separator colspan="4" string="Stock Moves"/>
                                             <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                                            <div>
+                                                <field name="notes" nolabel="1" placeholder="Add a note on order line..."/>
+                                            </div>
                                         </div>
                                     </group>
                                 </form>
@@ -264,11 +267,10 @@
                                 <field name="amount_tax"/>
                                 <field name="amount_total" class="oe_subtotal_footer_separator"/>
                             </group>
-                            <div class="oe_clear">
-                                <label for="note"/>
-                            </div>
+                            <group name="sale_delivery">
+                            </group>
                             <div>
-                                <field name="note" class="oe_inline"/>
+                                <field name="note" nolabel="1" class="oe_online" placeholder="Add a global note on the sale order..."/>
                             </div>
                         </page>
                         <page string="Other Information" groups="base.group_user">
@@ -300,7 +302,7 @@
                                 <tree string="Invoices" colors="blue:state == 'draft';black:state in ('proforma','proforma2','open');gray:state == 'cancel'">
                                     <field name="date_invoice"/>
                                     <field name="number"/>
-                                    <field name="partner_id"/>
+                                    <field name="partner_id" string="Customer"/>
                                     <field name="user_id"/>
                                     <field name="date_due"/>
                                     <field name="amount_total"/>
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index c45cd228dec..c56e66e5ae2 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,8 +8,13 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='sale_total']" position="inside">
-                <field name="margin"/>
+            <xpath expr="//group[@name='sale_delivery']" position="inside">
+                <group>
+                    <label for="margin"/>
+                    <div>
+                        <field name="margin"/>
+                    </div>
+                </group>
             </xpath>
         </field>
     </record>