diff options
| author | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2013-04-11 18:30:15 +0530 |
|---|---|---|
| committer | Randhir Mayatra (OpenERP) <rma@tinyerp.com> | 2013-04-11 18:30:15 +0530 |
| commit | b6ad182a70621a36ec02acfe7747f049ae1601b8 (patch) | |
| tree | fe8f59be85fdf15033a558fc9d26881dff445b18 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 1ee33ffb205e7ee2adc42ffa42eac7a50e6f7ad9 (diff) | |
| parent | 385f4dbaaa71e4ff6adef6ad2209b25134e95025 (diff) | |
[MERGE] merge with trunk
bzr revid: rma@tinyerp.com-20130411130015-n7tetfiol6go2yic
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 |