From 4497bc2da9d67d9e2a9dfd03af18ee497821a6e5 Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Thu, 4 Feb 2010 10:10:14 +0530
Subject: [PATCH 1/5] [Fix] : Menu Problem in attandance solved

bzr revid: vir@tinyerp.com-20100204044014-zh0yu0wuhgdc3pkn
---
 addons/hr_attendance/hr_attendance_wizard.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index bdec6414246..7e3d51629d2 100644
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -12,6 +12,7 @@
         <menuitem action="si_so" id="menu_si_so" parent="menu_hr_time_tracking" type="wizard" sequence="1"
             groups="group_hr_attendance"/>
         <!--Time Tracking menu for Project Management-->
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
          <menuitem
              id="base.menu_project_management_time_tracking"
              name="Time Tracking"

From 04c771667875ba3b87de025bdc1f9a6e9cd56971 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 4 Feb 2010 10:54:08 +0530
Subject: [PATCH 2/5] [Fix] : Removed unused dependance from wiki module

bzr revid: vir@tinyerp.com-20100204052408-182x6nkx1dw699ml
---
 addons/document/document_view.xml              |  8 ++++----
 addons/document/security/document_security.xml |  2 +-
 addons/wiki/__terp__.py                        |  2 +-
 addons/wiki/wiki_view.xml                      | 15 +++++++--------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index ab156cf1feb..3fa805388c0 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -3,9 +3,9 @@
     <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
     <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
 
-    <menuitem name="Knowledge Management" icon="terp-stock" id="menu_document"/>
-    <menuitem name="Configuration" id="menu_document_configuration" parent="menu_document" sequence="50"/>
-    <menuitem name="Document Management" id="menu_document_management_configuration" parent="menu_document_configuration" />
+    <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
+    <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"/>
 
     <record model="ir.ui.view" id="view_document_storage_form">
         <field name="name">document.storage</field>
@@ -249,7 +249,7 @@
         <field name="res_model">ir.attachment</field>
         <field name="view_type">form</field>
     </record>
-    <menuitem name="Documents" id="menu_document_doc" parent="menu_document" sequence="5"/>
+    <menuitem name="Documents" id="menu_document_doc" parent="base.menu_document" sequence="5"/>
     <menuitem
         name="Search a File"
         action="action_document_file_form"
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 0c227b13f8f..4eb257a2325 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -6,7 +6,7 @@
         <field name="name">Document / Manager</field>
     </record>
 
-    <record id="menu_document_configuration" model="ir.ui.menu">
+    <record id="base.menu_document_configuration" model="ir.ui.menu">
         <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
     </record>
 
diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index ebb858927f3..cf792be226f 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -30,7 +30,7 @@
     """,
     'author': 'Tiny & Axelor',
     'website': 'http://openerp.com',
-    'depends': ['base','document'],
+    'depends': ['base'],
     'init_xml': [],
     'update_xml': [
         'wiki_view.xml',
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 10aae9ed92b..2188accd668 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-       <!-- <menuitem name="Document Management" icon="terp-stock" id="menu_document2"/>-->
-       <menuitem name="Knowledge Management" icon="terp-stock" id="menu_document2"/>
-        <!--<menuitem name="Wiki Configuration" id="menu_document_configuration" parent="menu_document2"/>-->
-        <menuitem name="Wiki" id="menu_document_configuration" parent="document.menu_document_configuration"/>
-        <!--<menuitem parent="menu_document2" name="Wiki" id="menu_document"/>-->
-        <menuitem parent="menu_document2" name="Collaborative Content" id="menu_document"/>
+       <menuitem name="Knowledge Management" icon="terp-stock" id="base.menu_document"/>
+        <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
+        <menuitem name="Wiki" id="menu_wiki_configuration" parent="base.menu_document_configuration" sequence="2"/>
+        <menuitem id="base.menu_document2" name="Collaborative Content" parent="base.menu_document"/>
+
         <wizard
             id="wizard_group_menu_create"
             string="Create Menu"
@@ -70,7 +69,7 @@
             id="menu_action_wiki_groups"
             action="action_wiki_groups"/>-->
       <menuitem name="Wiki Groups"
-            parent="menu_document_configuration"
+            parent="menu_wiki_configuration"
             id="menu_action_wiki_groups"
             action="action_wiki_groups"/>
 
@@ -169,7 +168,7 @@
             <field name="context">{'section':'1'}</field>
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
-        <menuitem parent="menu_document" id="menu_action_wiki_wiki" name="Wiki Pages" action="action_wiki"/>
+        <menuitem parent="base.menu_document2" id="menu_action_wiki_wiki" name="Wiki Pages" action="action_wiki"/>
 
         <!--  Pages Waiting Review -->
         <record model="ir.actions.act_window" id="action_wiki_review">

From 94bb6fd374802ce9da8ae0888eb843e5708b3cba Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Thu, 4 Feb 2010 11:27:44 +0530
Subject: [PATCH 3/5] [Fix] : Removed unused dependancy from base_contact and
 changes related to purhcase module

bzr revid: vir@tinyerp.com-20100204055744-paui2msnr2xqcbyo
---
 addons/base_contact/__terp__.py                |  2 +-
 addons/base_contact/base_contact_view.xml      |  6 ++++--
 addons/purchase/purchase_view.xml              | 18 +++++++++---------
 .../purchase_manual/purchase_manual_view.xml   |  2 +-
 .../purchase_tender/purchase_tender_view.xml   |  2 +-
 .../report_purchase/report_purchase_view.xml   |  2 +-
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py
index 60c8d5f8fc3..af632e532b5 100644
--- a/addons/base_contact/__terp__.py
+++ b/addons/base_contact/__terp__.py
@@ -40,7 +40,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base','process','sale'],
+    'depends': ['base','process'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml
index 6123e7ed938..7f69d89661d 100644
--- a/addons/base_contact/base_contact_view.xml
+++ b/addons/base_contact/base_contact_view.xml
@@ -419,7 +419,9 @@
         res_model="res.partner.job"
         src_model="res.partner"
         />
-        <menuitem name="Contacts" id="menu_procurement_mgt_partner_contact_form" action="action_partner_contact_form"
-      parent="purchase.menu_procurement_management_supplier"/>
+    <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"/>
+    <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
+            parent="base.menu_purchase_root" sequence="3"/>
+    <menuitem name="Contacts" id="menu_partner_contact_supplier_form" action="action_partner_contact_form" parent = "base.menu_procurement_management_supplier" sequence="2"/>
 </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 4b6f184ebe2..6e9b06e040d 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <!--<menuitem icon="terp-purchase" id="menu_purchase_root" name="Purchase Management"
+        <!--<menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchase Management"
             groups="group_purchase_user"/>-->
-       <menuitem icon="terp-purchase" id="menu_purchase_root" name="Procurement Management"
+       <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Procurement Management"
             groups="group_purchase_user"/>
 	   <menuitem id="menu_procurement_management" name="Procurement Management"
-            parent="menu_purchase_root" sequence="1"/>
+            parent="base.menu_purchase_root" sequence="1"/>
 
      <!--supplier menu-->
-     <menuitem id="menu_procurement_management_supplier" name="Suppliers"
-            parent="menu_purchase_root" sequence="3"/>
+     <menuitem id="base.menu_procurement_management_supplier" name="Suppliers"
+            parent="base.menu_purchase_root" sequence="3"/>
      <menuitem id="menu_procurement_management_supplier_name" name="Suppliers"
-            parent="menu_procurement_management_supplier" action="base.action_partner_supplier_form" />
+            parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/>
 
 
 
           <!--Inventory control-->
       <menuitem id="menu_procurement_management_nventory" name="Inventory Control"
-            parent="menu_purchase_root" sequence="4"/>
+            parent="base.menu_purchase_root" sequence="4"/>
       <menuitem action="stock.action_picking_tree4" id="menu_action_picking_tree4" parent="menu_procurement_management_nventory"
       		name="Incoming shipments" sequence="9"/>
         <menuitem action="stock.action_reception_picking_move" id="menu_action_reception_picking_move"
@@ -26,13 +26,13 @@
 
      <!--Invoice control-->
       <menuitem id="menu_procurement_management_invoice" name="Invoice Control"
-            parent="menu_purchase_root" sequence="6"/>
+            parent="base.menu_purchase_root" sequence="6"/>
      <menuitem name="Pending Invoices" id="menu_procurement_management_panding_invoice" action="account.action_invoice_tree_panding_invoice"
       parent="menu_procurement_management_invoice"/>
 
       <!--product menu-->
       <menuitem id="menu_procurement_management_product" name="Product"
-            parent="menu_purchase_root" sequence="8"/>
+            parent="base.menu_purchase_root" sequence="8"/>
       <menuitem name="Products" id="menu_procurement_partner_contact_form" action="product.product_normal_action_puchased"
       parent="menu_procurement_management_product"/>
 
diff --git a/addons/purchase_manual/purchase_manual_view.xml b/addons/purchase_manual/purchase_manual_view.xml
index 60460f30546..4e698dcac53 100644
--- a/addons/purchase_manual/purchase_manual_view.xml
+++ b/addons/purchase_manual/purchase_manual_view.xml
@@ -77,7 +77,7 @@
             <field name="view_id" ref="purchase_order_line_form"/>
             <field name="act_window_id" ref="purchase_line_form_action"/>
         </record>
-<!--        <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="purchase.menu_purchase_root"/>-->
+<!--        <menuitem action="purchase_line_form_action" id="menu_purchase_line_form_action" parent="base.menu_purchase_root"/>-->
 
         <record id="purchase_line_form_action2" model="ir.actions.act_window">
             <field name="name">Uninvoiced Purchase Order Lines</field>
diff --git a/addons/purchase_tender/purchase_tender_view.xml b/addons/purchase_tender/purchase_tender_view.xml
index a91c36a7201..d76de0bee9f 100644
--- a/addons/purchase_tender/purchase_tender_view.xml
+++ b/addons/purchase_tender/purchase_tender_view.xml
@@ -68,7 +68,7 @@
             <field name="res_model">purchase.tender</field>
             <field name="view_type">form</field>
         </record>
-<!--        <menuitem name="Purchase Tenders" id="menu_purchase_tender" parent="purchase.menu_purchase_root"/>-->
+<!--        <menuitem name="Purchase Tenders" id="menu_purchase_tender" parent="base.menu_purchase_root"/>-->
 <!--        <menuitem id="menu_purchase_Tender1" parent="menu_purchase_tender" action="action_purchase_tender"/>-->
 		<menuitem id="menu_purchase_Tender_pro_mgt" parent="purchase.menu_procurement_management" action="action_purchase_tender"/>
         <record model="ir.actions.act_window" id="action_purchase_tender_draft">
diff --git a/addons/report_purchase/report_purchase_view.xml b/addons/report_purchase/report_purchase_view.xml
index fdfd860461a..e2559b2c539 100644
--- a/addons/report_purchase/report_purchase_view.xml
+++ b/addons/report_purchase/report_purchase_view.xml
@@ -79,7 +79,7 @@
             <field name="search_view_id" ref="view_order_product_search"/>
         </record>
 
-        <menuitem id="next_id_73" name="Reporting" parent="purchase.menu_purchase_root"/>
+        <menuitem id="next_id_73" name="Reporting" parent="base.menu_purchase_root"/>
         <menuitem action="action_order_product_tree_all" id="menu_report_order_product_all"
         	name="PO by Products" parent="next_id_73"/>
 

From a1d8c313f8debda5cd85d54773b32e992d253ef8 Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Thu, 4 Feb 2010 11:39:51 +0530
Subject: [PATCH 4/5] [Fix] : Removed unused dependecy from
 hr_timesheet_sheet,project_timesheet,report_timesheet modules

bzr revid: vir@tinyerp.com-20100204060951-e2pauqeltidz9vng
---
 addons/hr_timesheet_sheet/__terp__.py | 2 +-
 addons/project_timesheet/__terp__.py  | 2 +-
 addons/report_timesheet/__terp__.py   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py
index 68a4db8f82d..9042d4200f1 100644
--- a/addons/hr_timesheet_sheet/__terp__.py
+++ b/addons/hr_timesheet_sheet/__terp__.py
@@ -45,7 +45,7 @@ The validation can be configured in te company:
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process','hr_attendance'],
+    'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
diff --git a/addons/project_timesheet/__terp__.py b/addons/project_timesheet/__terp__.py
index 87ee1e4eff5..8e4cbb898a7 100644
--- a/addons/project_timesheet/__terp__.py
+++ b/addons/project_timesheet/__terp__.py
@@ -31,7 +31,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'project', 'hr_timesheet_sheet','hr_timesheet'],
+    'depends': ['base', 'project', 'hr_timesheet_sheet'],
     'init_xml': [],
     'update_xml': ["process/project_timesheet_process.xml"],
     'demo_xml': [],
diff --git a/addons/report_timesheet/__terp__.py b/addons/report_timesheet/__terp__.py
index 67d797f86cb..8fcf827af68 100644
--- a/addons/report_timesheet/__terp__.py
+++ b/addons/report_timesheet/__terp__.py
@@ -28,7 +28,7 @@
     All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['hr_timesheet', 'hr_timesheet_invoice','hr_attendance'],
+    'depends': ['hr_timesheet', 'hr_timesheet_invoice'],
     'init_xml': [],
     'update_xml': ['security/ir.model.access.csv', 'report_timesheet_view.xml'],
     'demo_xml': [],

From 881d9bfcb4baeb4d9d1155159dd5679360cc7b83 Mon Sep 17 00:00:00 2001
From: "RCH(Open ERP)" <>
Date: Thu, 4 Feb 2010 18:06:40 +0530
Subject: [PATCH 5/5] [Fix] : Removed unused dependancy

bzr revid: vir@tinyerp.com-20100204123640-qjyjbm5qa2psza0x
---
 addons/hr_holidays/__terp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 7e11b7557e0..f84a026748b 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -47,7 +47,7 @@
 """,
     'author': 'Tiny & Axelor',
     'website': 'http://www.openerp.com',
-    'depends': ['hr', 'crm', 'process','hr_attendance'],
+    'depends': ['hr', 'crm', 'process'],
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',