[MERGE]merge with trunk addons

bzr revid: sgo@tinyerp.com-20120917065740-w9a3xhe632368t2n

1 files changed, 4 insertions, 1 deletions

diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 61106fbf234..5680184a9fb 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,4 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_mail_global,mail.mail,model_mail_mail,base.group_system,1,1,1,1

 access_mail_message_all,mail.message.all,model_mail_message,,1,0,0,0

 access_mail_message_group_user,mail.message.group.user,model_mail_message,base.group_user,1,1,1,1

 access_mail_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0

@@ -7,4 +8,6 @@ access_mail_notification_all,mail.notification.all,model_mail_notification,,1,1,
 access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1

 access_mail_alias_user,mail.alias,model_mail_alias,base.group_user,1,1,1,0

 access_mail_alias_system,mail.alias,model_mail_alias,base.group_system,1,1,1,1

-access_mail_message_subtype,mail.message.subtype,model_mail_message_subtype,,1,1,1,1
\ No newline at end of file
+access_mail_message_subtype,mail.message.subtype,model_mail_message_subtype,,1,1,1,1

+access_mail_mail_user,mail.mail,model_mail_mail,base.group_user,1,1,1,0

+access_mail_mail_manager,mail.mail,model_mail_mail,group_mail_manager,1,1,1,1