From 6b4a1a3d55dfcc671d5741e7774bf07e4573bb57 Mon Sep 17 00:00:00 2001
From: "ajay javiya (OpenERP)" <aja@tinyerp.com>
Date: Thu, 26 Sep 2013 18:53:22 +0530
Subject: [PATCH] [IMP]: Rename log a note to Log an internal note

bzr revid: aja@tinyerp.com-20130926132322-pvu18fr5w24lc18m
---
 addons/mail/mail_message.py         | 12 ------------
 addons/mail/mail_thread.py          |  2 +-
 addons/mail/static/src/xml/mail.xml |  6 +++---
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py
index 6ed6b146d50..72ccdc83bb6 100644
--- a/addons/mail/mail_message.py
+++ b/addons/mail/mail_message.py
@@ -1023,15 +1023,3 @@ class mail_message(osv.Model):
                     'message': warning_msg,
                     }
                 }
-
-class ir_actions_client(osv.Model):
-
-    _inherit = 'ir.actions.client'
-
-    def check_message_security(self, cr, uid, context=None):
-        flag = False
-        group =  self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'group_user')
-        if group:
-            users = self.pool.get('res.groups').read(cr, uid, group[1], ['users'])['users']
-            flag = uid in users and True or False
-        return flag
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 47022f88f84..9e0fc96cc14 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -1319,7 +1319,7 @@ class mail_thread(osv.AbstractModel):
         #raise error on comment message if user is not employee
         employee = self._check_user_is_employee(cr, uid, context=context)
         if not employee and type == 'comment':
-            raise orm.except_orm(_('Warning'),_('Restricted to employees.'))
+            raise orm.except_orm(_('Warning'),_('Oops! Something went wrong, You are not allowed to post a note.'))
 
         # if we're processing a message directly coming from the gateway, the destination model was
         # set in the context.
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 182346cc832..c3a118db50f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -34,7 +34,7 @@
                     <div class="oe_msg_attachment_list"></div>
                     <button class="oe_post">
                         <t t-if="!widget.is_log">Send</t>
-                        <t t-if="widget.is_log">Log a note</t>
+                        <t t-if="widget.is_log">Log an internal note</t>
                     </button>
                     <t t-call="mail.compose_message.add_attachment"/>
                 </div>
@@ -53,7 +53,7 @@
                     <a class="oe_compose_post" t-if="!widget.options.compose_placeholder and !widget.options.view_mailbox">Send a message</a>
                     <t t-if="widget.options.display_log_button">
                        <span class="oe_grey oe_sep_word">or</span>
-                       <a class="oe_compose_log">Log a note</a>
+                       <a class="oe_compose_log">Log an internal note</a>
                     </t>
                 </div>
             </t>
@@ -157,7 +157,7 @@
             </t>
         </div>
         <div t-if="widget.is_log">
-            <span>Attach a note that will not be sent to the followers</span>
+            <span>Add an internal note that will not be sent to the followers</span>
         </div>
     </t>