diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2013-06-04 15:14:28 +0200 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2013-06-04 15:14:28 +0200 |
| commit | 3f8551e68c2a4dbe5436531df7d752fb60d0223a (patch) | |
| tree | a569f9a8d0be38537815d97229acee44788dbb78 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 430be2d880de8dbb015d2e099f8ff7a2b02c44e5 (diff) | |
| parent | 95c9d77c9f6330c4f87da460124cc59d4bd852b2 (diff) | |
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20130604131428-nh9ikodh8lit5p7b
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 |