[MERGE]upstream

bzr revid: dle@openerp.com-20130625162046-snd83ltaha9o5fl8

3 files changed, 9 insertions, 14 deletions

diff --git a/addons/idea/security/idea.xml b/addons/idea/security/idea.xml
new file mode 100644
index 00000000000..e7a0d800187
--- /dev/null
+++ b/addons/idea/security/idea.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+    </data>
+</openerp>
+
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
deleted file mode 100644
index 8743252c9e5..00000000000
--- a/addons/idea/security/idea_security.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-<data>
-
-    <record model="res.groups" id="base.group_tool_user">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_tools"/>
-    </record>
-
-</data>
-</openerp>
-
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index 78b8deeaf57..761ada8132c 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,3 +1,3 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

-access_idea_category_user,idea.category user,model_idea_category,base.group_tool_user,1,1,1,1

-access_idea_idea_user,idea.idea user,model_idea_idea,base.group_tool_user,1,1,1,1

+access_idea_category_user,idea.category.user,model_idea_category,base.group_user,1,1,1,1

+access_idea_idea_user,idea.idea.user,model_idea_idea,base.group_user,1,1,1,1