[MERGE] merge with main addons

bzr revid: rpr@tinyerp.com-20121005120503-07e0zo8ucv8k0q3s

2 files changed, 24 insertions, 21 deletions

diff --git a/addons/mail/security/ir.model.access.csv b/addons/mail/security/ir.model.access.csv
index 2ec74086a34..b68a9ab7443 100644
--- a/addons/mail/security/ir.model.access.csv
+++ b/addons/mail/security/ir.model.access.csv
@@ -1,13 +1,17 @@
 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_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_thread,mail.thread,model_mail_thread,base.group_user,1,1,1,0

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

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

-access_mail_group,mail.group,model_mail_group,base.group_user,1,1,1,1

+access_mail_mail_all,mail.mail.all,model_mail_mail,,0,0,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,,0,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_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_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

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

diff --git a/addons/mail/security/mail_security.xml b/addons/mail/security/mail_security.xml
index a12314e6f25..b503565bd11 100644
--- a/addons/mail/security/mail_security.xml
+++ b/addons/mail/security/mail_security.xml
@@ -2,20 +2,6 @@
 <openerp>
     <data>
 
-        <!-- CATEGORY -->
-        <record model="ir.module.category" id="module_category_social">
-            <field name="name">Social and Sharing Tools</field>
-            <field name="parent_id" ref="base.module_category_tools"/>
-            <field name="sequence">26</field>
-        </record>
-
-        <!-- GROUPS -->
-        <record id="group_mail_manager" model="res.groups">
-            <field name="name">Mail manager</field>
-            <field name="comment"></field>
-            <field name="category_id" ref="module_category_social"/>
-        </record>
-
         <!-- RULES -->
         <record id="group_rule_public_and_joined" model="ir.rule">
             <field name="name">Mail.group: access only public and joined groups</field>
@@ -24,5 +10,18 @@
             <field name="domain_force">['|', '|', ('public', '=', 'public'), ('message_follower_ids', 'in', [user.id]), '&amp;', ('public','=','groups'), ('group_public_id','in', [x.id for x in user.groups_id])]</field>
         </record>
 
+        <!--
+        This rule can not be uncommented, because we have a more wide method in mail.message. When we implement a many2one_variable field, we will be able to uncomment this.
+
+        <record id="mail_message_read_partner_or_author" model="ir.rule">
+            <field name="name">mail.message: read if notified or author</field>
+            <field name="model_id" ref="model_mail_message"/>
+            <field name="domain_force">['|', ('partner_ids', 'in', user.partner_id.id), ('author_id', '=', user.partner_id.id)]</field>
+            <field name="perm_create" eval="False"/>
+            <field name="perm_write" eval="False"/>
+            <field name="perm_unlink" eval="False"/>
+        </record>
+        -->
+
     </data>
 </openerp>