[MERGE] trunk

bzr revid: abo@openerp.com-20121030154647-6acbljvitcmphriz

1 files changed, 3 insertions, 2 deletions

diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index c609667c26e..52c6c605109 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -2,6 +2,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_mail_message_all,mail.message.all,model_mail_message,,1,0,1,0

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

 access_mail_mail_all,mail.mail.all,model_mail_mail,,0,0,1,0

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

 access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,1,1,1,1

 access_mail_followers_all,mail.followers.all,model_mail_followers,,1,0,0,0

 access_mail_followers_system,mail.followers.system,model_mail_followers,base.group_system,1,1,1,1

@@ -12,6 +13,6 @@ access_mail_group_user,mail.group.user,model_mail_group,base.group_user,1,1,1,1
 access_mail_alias_all,mail.alias.all,model_mail_alias,,1,0,0,0

 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

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

+access_mail_message_subtype_all,mail.message.subtype.all,model_mail_message_subtype,,1,0,0,0

 access_mail_vote_all,mail.vote.all,model_mail_vote,,1,1,1,1

+access_mail_favorite_all,mail.favorite.all,model_mail_favorite,,1,1,1,1
\ No newline at end of file