summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function/analytic_user_function.py
diff options
context:
space:
mode:
authorRGA(OpenERP) <>2013-04-23 12:58:08 +0530
committerRGA(OpenERP) <>2013-04-23 12:58:08 +0530
commit63c7c5976ea1db158c6f04b9701a29f46693db39 (patch)
tree432f4e95d73fd7e1636a1accd82f7e76c070b580 /addons/analytic_user_function/analytic_user_function.py
parent31696e3de5b050903be749fcd4d06d5c3d4e8026 (diff)
parent33f27b362b7de57c10782d4ddee9f4b053f06905 (diff)
Merge with trunk
bzr revid: rgaopenerp-20130423072808-ng99rquxsns238xl
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