diff options
| author | Thibault Delavallee <tde@openerp.com> | 2013-03-12 15:10:47 +0100 |
|---|---|---|
| committer | Thibault Delavallee <tde@openerp.com> | 2013-03-12 15:10:47 +0100 |
| commit | edc5f2fc43c5ef667fe552560b7911ba1511ada1 (patch) | |
| tree | 812965f2d5bf8dfafa8a921f364bfa12f40c6167 /addons/analytic_user_function/analytic_user_function.py | |
| parent | fcea61b6ebce561743bfe3876dd5a705ce6a7bad (diff) | |
| parent | 3aa39206f9672488f94e3d87c7d7321e402c3a3d (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130312141047-tiga9bhz3m3wc2qr
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 |