From 0589af4d6b85912c25bc86ce8a5cea8cdc6b3477 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Tue, 29 Jun 2010 11:57:47 +0200
Subject: merge

bzr revid: fp@tinyerp.com-20100629095747-svyjt9e9qak74y3c
---
 addons/document/document_view.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'addons/document/document_view.xml')

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 5dc1bbcf0f8..e4355987fbb 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>
@@ -323,7 +318,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"
-- 
cgit v1.2.3