diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2013-03-22 14:49:58 +0100 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2013-03-22 14:49:58 +0100 |
| commit | 9b0ced610f35adff2db9cc47206b49d14d1f30ac (patch) | |
| tree | da13a82d3f565b74d0bf7505ce880836f514dcdc /addons/analytic_user_function/analytic_user_function.py | |
| parent | 64a35f6859aaecf5bb3de623b1fde70277017ae7 (diff) | |
| parent | 5a3ed6f024cd093bad7f01466af526e4905e58c8 (diff) | |
[MERGE] merged trunk.
bzr revid: vmt@openerp.com-20130322134958-jhe6m0222jq7wo41
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 |