[MERGE] latest trunk

bzr revid: abo@openerp.com-20120917114455-nygv16c93qwcwnsx

3 files changed, 19 insertions, 0 deletions

diff --git a/addons/note/security/ir.model.access.csv b/addons/note/security/ir.model.access.csv
new file mode 100644
index 00000000000..cbe11cba94e
--- /dev/null
+++ b/addons/note/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+access_note_stage,note.stage,model_note_stage,base.group_user,1,1,1,1

+access_note_note,note.note,model_note_note,base.group_user,1,1,1,1

+access_note_tag,note.tag,model_note_tag,base.group_user,1,1,1,1

diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml
new file mode 100644
index 00000000000..3d2f0d242f6
--- /dev/null
+++ b/addons/note/security/ir.rule.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<openerp>
+<data>
+    <record id="note_note_rule_global" model="ir.rule">
+        <field name="name">Only followers can access a sticky notes</field>
+        <field model="ir.model" ref="model_note_note" name="model_id"/>
+        <field name="domain_force">['|',('message_follower_ids','=',False),('message_follower_ids','=',user.partner_id.id)]</field>
+        <field eval="True" name="global"/>
+    </record>
+</data>
+</openerp>
+
diff --git a/addons/note/security/res.groups.csv b/addons/note/security/res.groups.csv
new file mode 100644
index 00000000000..61c54c964ff
--- /dev/null
+++ b/addons/note/security/res.groups.csv
@@ -0,0 +1,3 @@
+id,name,implied_ids/id

+group_note_tags,Memo / Display tags,

+group_note_fancy,Memo / Fancy mode,