diff options
| author | Foram Katharotiya (OpenERP) <fka@tinyerp.com> | 2013-04-23 12:12:39 +0530 |
|---|---|---|
| committer | Foram Katharotiya (OpenERP) <fka@tinyerp.com> | 2013-04-23 12:12:39 +0530 |
| commit | ca86967f47830843a598ea83d8a28993d9568e2b (patch) | |
| tree | e2ac9b6704b14a82ffed01954238901ee171097c /addons/analytic_user_function/analytic_user_function.py | |
| parent | bc3404e24726870a5c6e292ac9ddb9fcb241b200 (diff) | |
| parent | 33f27b362b7de57c10782d4ddee9f4b053f06905 (diff) | |
[MERGE] with trunk
bzr revid: fka@tinyerp.com-20130423064239-jkjxdpzldt00wm1y
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 |