Rifakat (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/6.1-opw-575200-rha into 
lp:openobject-addons/6.1.

Requested reviews:
  Naresh(OpenERP) (nch-openerp)
Related bugs:
  Bug #1000556 in OpenERP Addons: "field margin doesn't work properly when 
sale_layout is installed"
  https://bugs.launchpad.net/openobject-addons/+bug/1000556

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575200-rha/+merge/109343

Hello,

I have fixed problem of margin field. Margin was not calculated properly
when we have sale_layout and sale_margin both modules installed.

Tested it with and without installing sale_layout and it works.

Please reveiw it.

Regards,
Rifakat Haradwala


-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-opw-575200-rha/+merge/109343
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openobject-addons/6.1-opw-575200-rha.
=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py	2011-11-11 08:28:08 +0000
+++ sale_margin/sale_margin.py	2012-06-08 12:22:25 +0000
@@ -75,7 +75,7 @@
     _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': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 20),
+                'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line', 'abstract_line_ids'], 20),
                 }),
     }
 

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to