[MERGE]merge with trunk

bzr revid: rma@tinyerp.com-20121119110824-rj4y32rfbszqln7g

1 files changed, 6 insertions, 3 deletions

diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 4d68b7e3aef..37c6952717c 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -7,12 +7,15 @@ access_mail_mail_system,mail.mail.system,model_mail_mail,base.group_system,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

 access_mail_notification_all,mail.notification.all,model_mail_notification,,1,0,0,0

-access_mail_notification_aystem,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1

+access_mail_notification_group_user,mail.notification.user,model_mail_notification,base.group_user,1,1,1,0

+access_mail_notification_system,mail.notification.system,model_mail_notification,base.group_system,1,1,1,1

 access_mail_group_all,mail.group.all,model_mail_group,,1,0,0,0

 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_alias_user,mail.alias.user,model_mail_alias,base.group_user,1,1,1,0

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

 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

+access_mail_thread_all,mail.thread.all,model_mail_thread,,1,1,1,1

+access_publisher_warranty_contract_all,publisher.warranty.contract.all,model_publisher_warranty_contract,,1,1,1,1