diff options
| author | Sanjay Gohel (OpenERP) <sgo@tinyerp.com> | 2013-10-29 19:03:47 +0530 |
|---|---|---|
| committer | Sanjay Gohel (OpenERP) <sgo@tinyerp.com> | 2013-10-29 19:03:47 +0530 |
| commit | eb1a56cd91b9f36bed54c458e88cdb51ac913d97 (patch) | |
| tree | ed9064b34f0ebd1b9ec23bb90b1af2a556245d25 /addons/analytic_user_function/analytic_user_function.py | |
| parent | 328ec9ceacfca0fddc9e23cc201a31c746b40225 (diff) | |
| parent | 34564de66de6c3fa343a044d87e6a140f970a4f6 (diff) | |
[MERGE]merge and resolve conflicts
bzr revid: sgo@tinyerp.com-20131029133347-b22zkm0hgg3y9an3
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 1adefb2d59d..2671fc92581 100644 --- a/addons/analytic_user_function/analytic_user_function.py +++ b/addons/analytic_user_function/analytic_user_function.py @@ -42,6 +42,7 @@ class analytic_user_funct_grid(osv.osv): return {} value = {} + prod = False 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) |