[Fix] : Removed unwanted dependency from Project module

bzr revid: vir@tinyerp.com-20100203114421-9hpcy38sn13w8un1

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
index 232ba27..6dafe28 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <menuitem id="next_id_71" name="Financial Project Management" parent="project.menu_main" groups="account.group_account_invoice" sequence="20"/>
+        <menuitem id="next_id_71" name="Financial Project Management" parent="base.menu_main_pm" groups="account.group_account_invoice" sequence="20"/>
         <menuitem id="menu_invoicing" name="Invoicing" parent="next_id_71" sequence="20"/>
 
         <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window">

diff --git a/addons/account_budget/crossovered_budget_view.xml b/addons/account_budget/crossovered_budget_view.xml
index 86516f3..bdb8bfd 100644 (file)
--- a/addons/account_budget/crossovered_budget_view.xml
+++ b/addons/account_budget/crossovered_budget_view.xml
@@ -294,6 +294,14 @@
             auto="False"
             menu="False"/>-->
 
+               <!--Menu for project management-->
+               <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+               <menuitem id="base.menu_pm_invoicing" name="Invoicing" parent="base.menu_main_pm" sequence="7"/>
+        <menuitem id="menu_pm_budget" name="Budgets" parent="base.menu_pm_invoicing"/>
+        <menuitem action="open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
+        <menuitem parent="menu_pm_budget"
+             id="menu_act_pm_crossovered_budget_view"
+             action="act_crossovered_budget_view" />
     </data>
 </openerp>
 

diff --git a/addons/crm_project/crm_bugs_menu.xml b/addons/crm_project/crm_bugs_menu.xml
index 627fab5..442744a 100644 (file)
--- a/addons/crm_project/crm_bugs_menu.xml
+++ b/addons/crm_project/crm_bugs_menu.xml
@@ -6,34 +6,34 @@
     <record model="crm.case.categ" id="categ1">
         <field name="name">Bugs</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
+               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ2">
         <field name="name">Patches</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
+               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
     </record>
     <record model="crm.case.categ" id="categ3">
         <field name="name">Feature Requests</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
+               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage2">
         <field name="name">Fixed</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
+               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
     </record>
     <record model="crm.case.stage" id="stage5">
         <field name="name">Awaiting Response</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>           
-    </record>    
+               <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
+    </record>
     <record model="crm.case.stage" id="stage7">
         <field name="name">Future</field>
         <field name="section_id" ref="crm.section_sales_department"/>
-        <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>   
-    </record>       
-    
+        <field name="object_id" search="[('model','=','crm.project.bug')]" model="ir.model"/>
+    </record>
+
 
     ######################## BUG TRACKING (menu) ###########################
     <!--
@@ -67,7 +67,7 @@
         <field name="act_window_id" ref="crm_case_categ_act0"/>
     </record>
 
-    <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>-->
+    <!--<menuitem id="menu_aftertask" name="Bug" parent="base.menu_main_pm" visible="False"/>-->
     <menuitem name="Issues" id="menu_crm_case_bug_track"  parent="project.menu_project_management" action="crm_case_categ_act0"/>
 </data>
 </openerp>

diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml
index dcfadeb..bdec641 100644 (file)
--- a/addons/hr_attendance/hr_attendance_wizard.xml
+++ b/addons/hr_attendance/hr_attendance_wizard.xml
@@ -11,6 +11,12 @@
 
         <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
+             id="base.menu_project_management_time_tracking"
+             name="Time Tracking"
+             parent="base.menu_main_pm" sequence="3"/>
+        <menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="base.menu_project_management_time_tracking" type="wizard" sequence="9"/>
 
     </data>
 </openerp>

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 79650ce..c9cfc6c 100644 (file)
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -219,6 +219,14 @@
             <field name="view_id" eval="False"/>
             <field name="search_view_id" ref="view_hr_timesheet_sheet_filter"/>
         </record>
+        <!--Time Tracking menu in 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"
+             parent="base.menu_main_pm" sequence="3"/>
+         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="base.menu_project_management_time_tracking"
+             groups="hr.group_hr_manager" sequence="5"/>
         <!--<menuitem id="next_id_60" name="Timesheets" parent="hr.menu_hr_root"/>-->
         <menuitem action="act_hr_timesheet_sheet_form" id="menu_act_hr_timesheet_sheet_form" parent="hr_attendance.menu_hr_time_tracking"
             groups="hr.group_hr_manager"/>

diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py
index 5c7030a..7f78e37 100644 (file)
--- a/addons/project/__terp__.py
+++ b/addons/project/__terp__.py
@@ -26,7 +26,7 @@
     "author" : "Tiny",
     "website" : "http://www.openerp.com",
     "category" : "Generic Modules/Projects & Services",
-    "depends" : ["product", "account", "hr", "process", "mail_gateway","hr_timesheet_sheet","report_timesheet","account_budget"],
+    "depends" : ["product", "account", "hr", "process", "mail_gateway"],
     "description": """Project management module that track multi-level projects, tasks,
 works done on tasks, eso. It is able to render planning, order tasks, eso.
     """,

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 1e75b2a..a4a23ec 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <menuitem icon="terp-project" id="menu_main" name="Project Management"/>
-         <menuitem id="menu_project_management" name="Project Management" parent="menu_main" sequence="1"/>
-
-        <menuitem id="menu_pm_invoicing" name="Invoicing" parent="menu_main" sequence="7"/>
-        <menuitem id="menu_pm_budget" name="Budgets" parent="menu_pm_invoicing"/>
-        <menuitem action="account_budget.open_budget_post_form" id="menu_pm_budget_post_form" parent="menu_pm_budget"/>
-        <menuitem parent="menu_pm_budget"
-             id="menu_act_pm_crossovered_budget_view"
-             action="account_budget.act_crossovered_budget_view" />
-         <menuitem id="menu_definitions" name="Configuration" parent="project.menu_main" sequence="60"/>
-         <!--Time Tracking menu-->
-         <menuitem
-             id="menu_project_management_time_tracking"
-             name="Time Tracking"
-             parent="menu_main" sequence="3"/>
-         <menuitem action="hr_timesheet_sheet.act_hr_timesheet_sheet_form" id="menu_act_project_management_timesheet_sheet_form" parent="menu_project_management_time_tracking"
-             groups="hr.group_hr_manager"/>
-        <menuitem action="report_timesheet.action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="menu_project_management_time_tracking"/>
-        <menuitem action="hr_attendance.si_so" id="menu_project_management_si_so" parent="menu_project_management_time_tracking" type="wizard"/>
+        <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management"/>
+        <menuitem id="menu_project_management" name="Project Management" parent="base.menu_main_pm" sequence="1"/>
+
+         <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
 
         <!-- Project -->
         <record id="edit_project" model="ir.ui.view">
@@ -146,7 +131,7 @@
                 </tree>
             </field>
         </record>
-        <!--<menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/> -->
+        <!--<menuitem id="menu_all_project" parent="base.menu_main_pm" name="Projects"/> -->
 
         <record id="open_view_project_all" model="ir.actions.act_window">
             <field name="name">Projects</field>
@@ -661,7 +646,7 @@
             <field name="view_id" ref="view_project_message_tree"/>
        </record>
 
-        <!--<menuitem id="menu_message_main" name="Message" parent="menu_main"/>-->
+        <!--<menuitem id="menu_message_main" name="Message" parent="base.menu_main_pm"/>-->
         <menuitem action="action_view_project_messages_tree" id="menu_message_tree" parent="menu_project_management" sequence="11"/>
 
         <act_window domain="[('user_id', '=', active_id),('state', '&lt;&gt;', 'cancelled'),('state', '&lt;&gt;', 'done')]" id="act_res_users_2_project_task_opened" name="Assigned tasks" res_model="project.task" src_model="res.users" view_mode="tree,form,gantt,calendar,graph" view_type="form"/>

diff --git a/addons/report_analytic_planning/report_analytic_planning_view.xml b/addons/report_analytic_planning/report_analytic_planning_view.xml
index 5d5c6aa..c9c746f 100644 (file)
--- a/addons/report_analytic_planning/report_analytic_planning_view.xml
+++ b/addons/report_analytic_planning/report_analytic_planning_view.xml
@@ -217,7 +217,7 @@
                        <field name="view_mode">tree,form</field>
                        <field name="search_view_id" ref="account_analytic_planning_view_search"/>
                </record>
-               <menuitem id="base.menu_pm_planning" name="Planning" parent="project.menu_main" sequence="5"/>
+               <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>
                <menuitem id="planning_main" name="Long Term Planning"
                        parent="base.menu_pm_planning" />
 

diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index ed9c066..087dda9 100644 (file)
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -369,6 +369,13 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_random_timesheet_lines_tree"/>
         </record>
+         <!--Time Tracking menu in 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"
+             parent="base.menu_main_pm" sequence="3"/>
+        <menuitem action="action_random_timesheet_lines_board" id="menu_project_management_timesheet_lines_board" parent="base.menu_project_management_time_tracking" sequence="7"/>
          <!--<menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board"
             parent="hr_attendance.menu_hr_time_tracking" groups="hr.group_hr_manager"/>-->
        <menuitem action="action_random_timesheet_lines_board" id="menu_hr_action_random_timesheet_lines_board" name="Timesheets Lines"

diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml
index fb6c3a7..521f2c5 100644 (file)
--- a/addons/scrum/scrum_view.xml
+++ b/addons/scrum/scrum_view.xml
@@ -47,7 +47,7 @@
             <field name="view_id" ref="view_scrum_project_tree"/>
             <field name="domain">[('parent_id','=',False),('scrum','=',1)]</field>
         </record>
-        <menuitem id="next_id_67" name="Scrum" parent="project.menu_main"/><menuitem action="action_scrum_project_tree" id="menu_action_scrum_project_tree" parent="next_id_67"/>
+        <menuitem id="next_id_67" name="Scrum" parent="base.menu_main_pm"/><menuitem action="action_scrum_project_tree" id="menu_action_scrum_project_tree" parent="next_id_67"/>
 
         <record id="action_scrum_project_form" model="ir.actions.act_window">
             <field name="name">Edit Projects</field>