diff options
| author | Josse Colpaert <jco@openerp.com> | 2013-03-20 15:47:06 +0100 |
|---|---|---|
| committer | Josse Colpaert <jco@openerp.com> | 2013-03-20 15:47:06 +0100 |
| commit | 6287c5c262345abe3001213187b6388d92da4cc6 (patch) | |
| tree | cd4ac4514e9a49477c3abcd66803cc22a1c1eb94 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 773a1fc51faa159bacd9e96ad68e274f0f78d789 (diff) | |
| parent | 31efad4ecd42a5028ca3e6ca5a5b7008279e15c5 (diff) | |
[MERGE] Merg efrom 7.0
bzr revid: jco@openerp.com-20130320144706-ylpji506pzhtj3do
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 |