summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/analytic_user_function.py
diff options
context:
space:
mode:
authorJosse Colpaert <jco@openerp.com>2013-04-08 17:17:51 +0200
committerJosse Colpaert <jco@openerp.com>2013-04-08 17:17:51 +0200
commitb3ac94189693b7a23ef934ad32890ba439f0afdc (patch)
tree97228ffede6eb123b1d9a472c6aa32480e1ada0e /addons/analytic_user_function/analytic_user_function.py
parent55ddb36921dcd7dea95efc8de2ddc3dba969845c (diff)
parent086b844df5304115982f60c1e5acc3742e0048e4 (diff)
[MERGE] Merge from trunk
bzr revid: jco@openerp.com-20130408151751-kta4x8swa6wcmsnl
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
-rw-r--r--addons/analytic_user_function/analytic_user_function.py4
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