summaryrefslogtreecommitdiff
path: root/addons/analytic_user_function
diff options
context:
space:
mode:
authorRandhir Mayatra (OpenERP) <rma@tinyerp.com>2013-06-07 18:48:09 +0530
committerRandhir Mayatra (OpenERP) <rma@tinyerp.com>2013-06-07 18:48:09 +0530
commit66293ed61a7cbad4d6a1d47f79c6f45deace155c (patch)
treeb05fe35d29232a1ea357614a907fa56e75c056ea /addons/analytic_user_function
parentff64d5a524612b9c9bb5d839e5c7e0834bcbdc88 (diff)
parent8c6ff33bef12cdfed35b15a90c3fd13bdd723b42 (diff)
[MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20130607131809-iw2q151jg8kvbw2m
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