diff options
| author | sgo@tinyerp.com <> | 2013-03-18 12:37:12 +0530 |
|---|---|---|
| committer | sgo@tinyerp.com <> | 2013-03-18 12:37:12 +0530 |
| commit | 8bc29546c2ac5b4946914ed79b83600abc883dd1 (patch) | |
| tree | 5e9484de22f239d8cc4d1742bf6b992be7b69f4d /addons/analytic_user_function/analytic_user_function.py | |
| parent | 1cc1008f63015bd920f5bfc2f757ece21d66a096 (diff) | |
| parent | 4ce8d2697d47f5fef279985a78059e34bee6f3ba (diff) | |
[MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130318070712-iw7cgss5elm1dw2l
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index ec2aa1688d6..0573292c1f6 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -42,12 +42,12 @@ class analytic_user_funct_grid(osv.osv): return {} value = {} + if product_id: + prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context) emp = emp_obj.browse(cr, uid, emp_id[0], context=context) if emp.product_id and not product_id: value['product_id'] = emp.product_id.id prod = emp.product_id - if product_id: - prod = self.pool.get('product.product').browse(cr, uid, product_id, context=context) if prod: value['price'] = prod.list_price value['uom_id'] = prod.uom_id.id |