Merge lp:~openerp-dev/openobject-addons/trunk-bug-715470-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

fixed the bug:ale margin module : wrong computation
https://bugs.launchpad.net/openobject-addons/+bug/715470

Thanks,
ara

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

rename the method _get_sale_order => _get_order_line

review: Needs Fixing

[Ashvin Rathod (OpenERP) (ara-tinyerp)]

Hello,

I have changed as you describe above.

Thanks,
ara

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[qdp (OpenERP) (qdp)]

patch was working, but by luck only.

Actually, the way to use the store = {} feature wasn't good but the orm was bugged and the priorities of functions wasn't working at all. So i just commited the right way to fix the issue in the addons, a patch is under testing server side and if it succeeds, i will merge without delay that branch.

[OpenERP buildbot (openerp-buildbot)]

crm_partner_assign/test/test_crm_partner_assign.yml[warning]: AssertionError in Python code : SMTP not configured !
project_timesheet/test/worktask_entry_to_timesheetline_entry.yml[warning]: Assertion "After hr manager's work task" FAILED test: len(timesheet_ids) > 0 values: ! 0 > 0
~/addons/anonymization/anonymization.py:298[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.
~/addons/anonymization/anonymization.py:300[pywarn]: The behavior of this method will change in future versions. Use specific 'len(elem)' or 'elem is not None' test instead.

review: Needs Fixing

[qdp (OpenERP) (qdp)]

i aproove and set Olivier as reviewer (in order to clean my merge proposal list) and as we are waiting for his patch server side.

review: Approve

[Olivier Dony (Odoo) (odo-openerp)]

The corresponding server-side fix landed in trunk at revision 3612 rev-id: <email address hidden>

=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py	2011-02-23 10:43:22 +0000
+++ sale_margin/sale_margin.py	2011-03-10 14:54:55 +0000
@@ -49,7 +49,8 @@
         return res
 
     _columns = {
-        'margin': fields.function(_product_margin, method=True, string='Margin', store=True),
+        'margin': fields.function(_product_margin, method=True, string='Margin',
+              store = True),
         'purchase_price': fields.float('Cost Price', digits=(16,2))
     }
 
@@ -66,8 +67,14 @@
                 result[sale.id] += line.margin or 0.0
         return result
 
+    def _get_order(self, cr, uid, ids, context=None):
+        return super(self,sale_order)._get_order(cr, uid, ids, context=context)
+
     _columns = {
-        'margin': fields.function(_product_margin, method=True, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price."),
+        'margin': fields.function(_product_margin, method=True, 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()