[FIX] sale_margin: gracefully handle margin update when sale_layout is installed

bzr revid: xal@openerp.com-20120925144826-ydxokahpjxv562tj

diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 43503ec..70d8857 100644 (file)
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -75,7 +75,7 @@ class sale_order(osv.osv):
 
     _columns = {
         'margin': fields.function(_product_margin, string='Margin', help="It gives profitability by calculating the difference between the Unit Price and Cost Price.", store={
-                'sale.order.line': (_get_order, ['margin'], 20),
+                'sale.order.line': (_get_order, [], 20),
                 'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 20),
                 }),
     }

diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index ad0b844..371a476 100644 (file)
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -19,8 +19,9 @@
         <field name="type">form</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="priority">1100</field>
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='order_line']/form//field[@name='price_unit']" position="after">
+            <xpath expr="//field[@name='order_line' or @name='abstract_line_ids']/form//field[@name='price_unit']" position="after">
                 <field name="purchase_price"/>
             </xpath>
         </field>
@@ -31,8 +32,9 @@
         <field name="type">form</field>
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
+        <field name="priority">1100</field>
         <field name="arch" type="xml">
-           <xpath expr="//field[@name='order_line']/tree//field[@name='price_unit']" position="after">
+           <xpath expr="//field[@name='order_line' or @name='abstract_line_ids']/tree//field[@name='price_unit']" position="after">
                 <field name="purchase_price"/>
             </xpath>
         </field>