Merge commit 'bd063948343552f' into trunk-doc2-api2

bzr revid: p_christ@hol.gr-20100701175018-l2qerpd8mzan894i

4 files changed, 4 insertions, 11 deletions

diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index e8b8b3969e9..a260a083d74 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -40,7 +40,7 @@
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process','board'],
+    'depends': ['process','board', 'knowledge'],
     'init_xml': [],
     'update_xml': [
         'security/document_security.xml',
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 7cbd01ad3eb..f342fb7cf56 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,11 +1,6 @@
 <openerp>
 <data>
-    <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
-    <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
-
-    <menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="19" groups="group_document_user"/>
-    <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
-    <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
+    <menuitem name="Document Management" id="menu_document_management_configuration" parent="knowledge.menu_document_configuration" sequence="1"/>
 
     <record model="ir.ui.view" id="view_document_storage_form">
         <field name="name">document.storage</field>
@@ -340,7 +335,7 @@
         <field name="name">Document</field>
         <field name="view_type">form</field>
     </record>
-    <menuitem name="Documents" id="menu_document_doc" parent="base.menu_document" sequence="5"/>
+    <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="5"/>
     <menuitem
         name="Documents"
         action="action_document_file_form"
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 333cc853542..d7b51ec19dc 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -10,7 +10,7 @@
         <field name="name">Document / Manager</field>
     </record>
 
-    <record id="base.menu_document_configuration" model="ir.ui.menu">
+    <record id="knowledge.menu_document_configuration" model="ir.ui.menu">
         <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
     </record>
 
diff --git a/addons/document/security/ir.model.access.csv b/addons/document/security/ir.model.access.csv
index a4412195745..245bcbffeab 100644
--- a/addons/document/security/ir.model.access.csv
+++ b/addons/document/security/ir.model.access.csv
@@ -19,5 +19,3 @@
 "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_system","report.document.wall group system","model_report_document_wall","base.group_system",1,0,0,0
-"access_document_configuation","document.configuration document manager","model_document_configuration","document.group_document_manager",1,1,1,1
-"access_document_configuation_system","document.configuration group system","model_document_configuration","base.group_system",1,1,1,1