summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function
diff options
context:
space:
mode:
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>2013-06-20 11:36:37 +0530
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>2013-06-20 11:36:37 +0530
commit9598f4c0bea8d8a8780a3bd837edcdcf6d98b957 (patch)
tree60ca2d08df614669fb3a6bfb0a4cbe287a51eae4 /addons/analytic_user_function
parentc3fd3ce311e25a4329d97af241c523126941492f (diff)
parent9ebfb79b6b4bd8cd2367c4467a935752e4f92e02 (diff)
[MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20130620060637-s4x59zxv02sna643
Diffstat (limited to 'addons/analytic_user_function')
-rw-r--r--addons/analytic_user_function/analytic_user_function.py4
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 0573292c1f6..1adefb2d59d 100644
--- a/addons/analytic_user_function/analytic_user_function.py
+++ b/addons/analytic_user_function/analytic_user_function.py
@@ -104,7 +104,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 +133,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