diff options
| author | Pinakin Nayi (OpenERP) <pna@tinyerp.com> | 2013-10-15 12:24:06 +0530 |
|---|---|---|
| committer | Pinakin Nayi (OpenERP) <pna@tinyerp.com> | 2013-10-15 12:24:06 +0530 |
| commit | 982bb843ce771f78f4514bc1e107dda6d669047c (patch) | |
| tree | 42ad84c79d9a432fa53db73b5719b549af664ba9 /addons/analytic_user_function/analytic_user_function.py | |
| parent | d0c9bd0df227b9d10b24d4b79004a6cef35b4cd1 (diff) | |
| parent | 8874046c398e251b4a1f2057b61e1ec14d894a36 (diff) | |
[MERGE]merge with main branch
bzr revid: pna@tinyerp.com-20131015065406-5u51hu1bn79zyxur
Diffstat (limited to 'addons/analytic_user_function/analytic_user_function.py')
| -rw-r--r-- | addons/analytic_user_function/analytic_user_function.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/addons/analytic_user_function/analytic_user_function.py b/addons/analytic_user_function/analytic_user_function.py index 0573292c1f6..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) @@ -104,7 +105,7 @@ class hr_analytic_timesheet(osv.osv): a = r.product_id.categ_id.property_account_expense_categ.id if not a: raise osv.except_osv(_('Error!'), - _('There is no expense account define ' \ + _('There is no expense account defined ' \ 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) # Compute based on pricetype @@ -133,7 +134,7 @@ class hr_analytic_timesheet(osv.osv): a = r.product_id.categ_id.property_account_expense_categ.id if not a: raise osv.except_osv(_('Error!'), - _('There is no expense account define ' \ + _('There is no expense account defined ' \ 'for this product: "%s" (id:%d)') % \ (r.product_id.name, r.product_id.id,)) # Compute based on pricetype |