diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-03-14 16:08:48 +0100 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-03-14 16:08:48 +0100 |
| commit | 83eddaef17f24a9f3c26b25d1c19053535a95d0a (patch) | |
| tree | ac51cc2233b53bdfb8d35408d26127d49a141351 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 99f6923804029dedc56175b497ea6de702387ff1 (diff) | |
| parent | 829961c05d8a0c977f8bfd4dad18264b71118cfa (diff) | |
merge trunk
bzr revid: nicolas.vanhoren@openerp.com-20130314150848-uq0j3u8oaq6qwh8m
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 |