diff options
| author | Dharti Ratani (Open ERP) <dhr@tinyerp.com> | 2013-03-15 14:49:14 +0530 |
|---|---|---|
| committer | Dharti Ratani (Open ERP) <dhr@tinyerp.com> | 2013-03-15 14:49:14 +0530 |
| commit | a47060f9ff6e4b81c2b9d9fb99adb378da6d01b0 (patch) | |
| tree | 466f79229afd1cc32a7dc155f37f9432d8b3057a /addons/analytic_user_function/analytic_user_function.py | |
| parent | 83767b0f3eb4883195b250f81c7c68516fc16201 (diff) | |
| parent | 72f29d98b8cd2f423b5eb60bf795612f20f0a262 (diff) | |
[MERGE]Merged with trunk
bzr revid: dhr@tinyerp.com-20130313050711-uqcfk4eju02hddgr
bzr revid: dhr@tinyerp.com-20130315091914-7n78yx8vd0wl65db
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 |