summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/analytic_user_function.py
diff options
context:
space:
mode:
authorVishmita Jadeja (openerp) <vja@tinyerp.com>2013-04-18 15:53:37 +0530
committerVishmita Jadeja (openerp) <vja@tinyerp.com>2013-04-18 15:53:37 +0530
commit26c3cc082d13776f618c24c5bb55d6f9cad64241 (patch)
tree1ca6086991ded58864f5ca825eb489b23c364046 /addons/analytic_user_function/analytic_user_function.py
parentd24459e4a9230ad1823c1db65429058a99d9347b (diff)
parentc8c95c1e9e04469dde15e3b197307cbdb44fd9ce (diff)
[Merge]Merge with Trunk
bzr revid: vja@tinyerp.com-20130418102337-bojdxp33leonvr1n
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