diff options
| author | Harry (OpenERP) <hmo@tinyerp.com> | 2011-12-14 17:59:24 +0530 |
|---|---|---|
| committer | Harry (OpenERP) <hmo@tinyerp.com> | 2011-12-14 17:59:24 +0530 |
| commit | 092f97b32b35af6a40b9d2ae70c3159da2fb235f (patch) | |
| tree | 2974d3719af9338cd0b1814da900d7e9ca8d4779 /addons/wiki/security | |
| parent | 593f5f571bbc49673975afc405e9345ef3457b92 (diff) | |
| parent | e36dc8c5e3ca3da1474747bae5ec87fea19b23b8 (diff) | |
[MERGE] merged with trunk-development-branch
bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g
Diffstat (limited to 'addons/wiki/security')
| -rw-r--r-- | addons/wiki/security/ir.model.access.csv | 16 | ||||
| -rw-r--r-- | addons/wiki/security/wiki_security.xml | 9 |
2 files changed, 10 insertions, 15 deletions
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv index 96545498ffc..0cbce7333f3 100644 --- a/addons/wiki/security/ir.model.access.csv +++ b/addons/wiki/security/ir.model.access.csv @@ -1,8 +1,8 @@ -"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 +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 index 98a8c03c177..16bd30c151f 100644 --- a/addons/wiki/security/wiki_security.xml +++ b/addons/wiki/security/wiki_security.xml @@ -2,14 +2,9 @@ <openerp> <data noupdate="0"> - <record id="base.group_sale_manager" model="res.groups"> - <field name="name">Sales / Manager</field> - </record> - <record id="base.group_sale_salesman" model="res.groups"> - <field name="name">Sales / User</field> - </record> <record id="base.group_document_user" model="res.groups"> - <field name="name">Knowledge / User</field> + <field name="name">User</field> + <field name="category_id" ref="base.module_category_knowledge_management"/> </record> </data> |