diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-03-14 09:34:01 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-03-14 09:34:01 +0100 |
| commit | 53150088adb18293fd039699120ad2caf872e101 (patch) | |
| tree | 01febde9b97e1aba3d619cc4e61a5345d7ce8e22 /addons/analytic_user_function/analytic_user_function.py | |
| parent | d80d18ff1b54295c4e48ed70910567cb19231c62 (diff) | |
| parent | 9568673e0f44c3c44d01dd90446bd1cf15f706a4 (diff) | |
[MERGE] Sync with trunk.
bzr revid: tde@openerp.com-20130314083401-6reysmzjuvnii1bz
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 |