[MERGE] Merged with addons/trunk.

bzr revid: tde@openerp.com-20120813073105-pz2vdiz7gc27triz

2 files changed, 0 insertions, 20 deletions

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

-wiki_wiki_all,wiki.wiki,model_wiki_wiki,,1,0,0,0

-wiki_groups_all,wiki.groups,model_wiki_groups,,1,0,0,0

-wiki_wiki,wiki.wiki,model_wiki_wiki,base.group_user,1,1,1,1

-wiki_groups,wiki.groups,model_wiki_groups,base.group_system,1,1,1,1

-wiki_wiki_history,wiki.wiki.history,model_wiki_wiki_history,base.group_user,1,0,1,0

-access_wiki_wiki_sale_manager,wiki.wiki.manager,model_wiki_wiki,base.group_sale_manager,1,1,1,1

-wiki_wiki_user,wiki.wiki user,model_wiki_wiki,base.group_document_user,1,1,1,1

diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
deleted file mode 100644
index ca9d34ae99c..00000000000
--- a/addons/wiki/security/wiki_security.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record id="base.group_document_user" model="res.groups">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_knowledge_management"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-    
-</data>
-</openerp>