summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/analytic_user_function.py
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2013-03-13 11:17:49 +0100
committerThibault Delavallée <tde@openerp.com>2013-03-13 11:17:49 +0100
commit41ea738c5936920ef4d56868e011afd1a3095f27 (patch)
tree74522be8915086be13795d8bdda0765fa1cb5f91 /addons/analytic_user_function/analytic_user_function.py
parent5dc95f38fea56514d902b185694fcfad0ea61407 (diff)
parentf79f6a5a25a0708e662f2deed4a54c704c6872b5 (diff)
[MERGE] Sync with 7.0
bzr revid: tde@openerp.com-20130313101749-4f79idf107fz7gve
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