[MERGE]

bzr revid: uco@tinyerp.com-20100809123622-hpw9djl5wtu80ccp
bzr revid: uco@tinyerp.com-20100810043605-rnht1jq7lx1pazah

2 files changed, 19 insertions, 15 deletions

diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index d7b51ec19dc..2bf1a2adb57 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -2,16 +2,16 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="group_document_user" model="res.groups">
-        <field name="name">Document / User</field>
+    <record id="base.group_document_user" model="res.groups">
+        <field name="name">Knowledge / User</field>
     </record>
 
-    <record id="group_document_manager" model="res.groups">
-        <field name="name">Document / Manager</field>
-    </record>
+<!--    <record id="group_document_manager" model="res.groups">-->
+<!--        <field name="name">Document / Manager</field>-->
+<!--    </record>-->
 
     <record id="knowledge.menu_document_configuration" model="ir.ui.menu">
-        <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
+        <field name="groups_id" eval="[(6,0,[ref('base.group_system')])]"/>
     </record>
 
 
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index 9684932b2a6..132daa1b7a6 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -1,22 +1,26 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_document_directory_all","document.directory all","model_document_directory",,1,0,0,0
-"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","group_document_manager",1,1,1,1
+"access_document_directory_group_document_manager","document.directory document manager","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_group_system","document.directory group system","model_document_directory","base.group_system",1,1,1,1
 "access_document_directory_content_all","document.directory.content all","model_document_directory_content",,1,0,0,0
-"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","group_document_manager",1,1,1,1
+"access_document_directory_content_group_document_manager","document.directory.content document manager","model_document_directory_content","base.group_system",1,1,1,1
 "access_document_directory_content_group_system","document.directory.content group system","model_document_directory_content","base.group_system",1,1,1,1
-"access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","group_document_manager",1,1,1,1
+"access_document_directory_content_type_group_document_manager","document.directory.content.type document manager","model_document_directory_content_type","base.group_system",1,1,1,1
 "access_document_directory_content_type_group_system","document.directory.content.type group system","model_document_directory_content_type","base.group_user",1,0,0,0
-"access_document_storage_group_document_manager","document.storage document manager","model_document_storage","group_document_manager",1,1,1,1
+"access_document_storage_group_document_manager","document.storage document manager","model_document_storage","base.group_system",1,1,1,1
 "access_document_storage_group_system","document.storage group system","model_document_storage","base.group_user",1,0,0,0
+"access_document_storage_group_user","document.storage group user","model_document_storage","base.group_document_user",1,1,1,1
+"access_ir_attachment_group_user","ir.attachment user","base.model_ir_attachment","base.group_document_user",1,1,1,1
+"access_ir_attachment_group_system","ir.attachment system","base.model_ir_attachment","base.group_system",1,0,0,0
+"access_res_partner_group_user","res.partner user","base.model_res_partner","base.group_document_user",1,1,1,1
 "access_document_directory_dctx_all","document.directory.dctx all","model_document_directory_dctx",,1,0,0,0
-"access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","group_document_manager",1,1,1,1
+"access_document_directory_dctx_group_document_manager","document.directory.dctx document manager","model_document_directory_dctx","base.group_system",1,1,1,1
 "access_document_directory_dctx_group_system","document.directory.dctx group system","model_document_directory_dctx","base.group_system",1,1,1,1
-"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","document.group_document_manager",1,0,0,0
+"access_report_document_user_group_document_manager","report.document.user document manager","model_report_document_user","base.group_system",1,0,0,0
 "access_report_document_user_group_system","report.document.user group system","model_report_document_user","base.group_system",1,0,0,0
-"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","document.group_document_manager",1,0,0,0
+"access_report_files_partner_group_document_manager","report.files.partner document manager","model_report_files_partner","base.group_system",1,0,0,0
 "access_report_files_partner_group_system","report.files.partner group system","model_report_files_partner","base.group_system",1,0,0,0
-"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","document.group_document_manager",1,0,0,0
+"access_report_document_file_group_document_manager","report.document.file document manager","model_report_document_file","base.group_system",1,0,0,0
 "access_report_document_file_group_system","report.document.file group system","model_report_document_file","base.group_system",1,0,0,0
-"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","document.group_document_manager",1,0,0,0
+"access_report_document_wall_group_document_manager","report.document.wall document manager","model_report_document_wall","base.group_system",1,0,0,0
 "access_report_document_wall_group_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0