diff options
| author | Geert Janssens <geert@kobaltwit.be> | 2013-04-25 16:47:20 +0200 |
|---|---|---|
| committer | Geert Janssens <geert@kobaltwit.be> | 2013-04-25 16:47:20 +0200 |
| commit | cadd2038a9b4e8b6e3351b5a3904395aa3d5d1cd (patch) | |
| tree | fe5230ee18ecbd21426625a1739aba3a958783dd /addons/analytic_user_function/analytic_user_function.py | |
| parent | 5f977a61ba47874b3442ddfbcd4faf2998df11ab (diff) | |
| parent | 5cf3622148352d32f78edf9ca4b59153526b233a (diff) | |
Merge current ~openerp/openobject-addons/7.0/
bzr revid: geert@kobaltwit.be-20130425144720-g5pkt4k12zoigj26
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 |