diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-20 17:10:45 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-20 17:10:45 +0100 |
| commit | 30a1d99d07e9888af63e8b8044b270f76872e52e (patch) | |
| tree | bd3abddcdbd35337104f80cbac1223c475ec959d /addons/analytic_user_function/analytic_user_function.py | |
| parent | a395638dfac9d791ea3f08fd323b0939ae050f83 (diff) | |
| parent | 1b2579f7778ec6037bc7c125a0bef09d01dbd8fb (diff) | |
[MERGE] Sync with trunk + fixed the fix and tests.
bzr revid: tde@openerp.com-20130320161045-41bpe36b09tgcxpo
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 |