summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViral Thakar <vit@mail.odoo.com>2017-12-13 15:46:05 +0530
committerRichard Mathot <rim@odoo.com>2017-12-13 11:16:05 +0100
commitf53f6f865bf6cf4ca1229bfcfdabb6c22ead44c8 (patch)
tree322012a818b08d2d5a5c116aea1e31d11317feca
parent6cc56d2c92eec4cd326ab5137ed42673e1712be5 (diff)
[IMP] hr,mail: adapt tooltip message to new field values and fix a typo
-rw-r--r--addons/hr/security/hr_security.xml4
-rw-r--r--addons/mail/models/res_users.py5
2 files changed, 4 insertions, 5 deletions
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index 70cfc1e68e4..b0e971e5491 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -5,12 +5,12 @@
<field name="name">Officer</field>
<field name="category_id" ref="base.module_category_human_resources"/>
<field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
- <field name="comment">the user will be able to approve document created by employees.</field>
+ <field name="comment">The user will be able to approve document created by employees.</field>
</record>
<record id="group_hr_manager" model="res.groups">
<field name="name">Manager</field>
- <field name="comment">the user will have an access to the human resources configuration as well as statistic reports.</field>
+ <field name="comment">The user will have an access to the human resources configuration as well as statistic reports.</field>
<field name="category_id" ref="base.module_category_human_resources"/>
<field name="implied_ids" eval="[(4, ref('group_hr_user'))]"/>
<field name="users" eval="[(4, ref('base.user_root'))]"/>
diff --git a/addons/mail/models/res_users.py b/addons/mail/models/res_users.py
index 3d6518010e6..436571f5b7a 100644
--- a/addons/mail/models/res_users.py
+++ b/addons/mail/models/res_users.py
@@ -30,9 +30,8 @@ class Users(models.Model):
('inbox', 'Handle in Odoo')],
'Notification Management', required=True, default='email',
help="Policy on how to handle Chatter notifications:\n"
- "- Emails: notifications are sent to your email\n"
- "- Odoo: notifications appear in your Odoo Inbox")
-
+ "- Handle by Emails: notifications are sent to your email address\n"
+ "- Handle in Odoo: notifications appear in your Odoo Inbox")
def __init__(self, pool, cr):
""" Override of __init__ to add access rights on notification_email_send
and alias fields. Access rights are disabled by default, but allowed