[MERGE] menu structure

bzr revid: hmo@tinyerp.com-20100120130015-mo5nbqsi0m7spb2o

diff --cc addons/project/project_view.xml
index cee6d9a,cee6d9a..b0f7ca4
--- 1/addons/project/project_view.xml
--- 2/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@@ -151,14 -151,14 +151,14 @@@
          <!--<menuitem id="menu_all_project" parent="project.menu_main" name="Projects"/> -->
  
          <record id="open_view_project_all" model="ir.actions.act_window">
--            <field name="name">All projects</field>
++            <field name="name">Projects</field>
              <field name="res_model">project.project</field>
              <field name="view_type">form</field>
              <field name="domain">[]</field>
              <field name="view_id" ref="view_project"/>
              <field name="search_view_id" ref="view_project_project_filter"/>
          </record>
--        <!--<menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_all_project"/> -->
++        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
  
          <record id="open_view_template_project" model="ir.actions.act_window">
              <field name="name">Templates of Projects</field>
@@@ -503,7 -503,7 +503,7 @@@
              <field name="search_view_id" ref="view_task_search_form"/>
          </record>
          <!--<menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_tasks"/> -->
--              <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" name="Tasks"/>
++              <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" name="Tasks" sequence="2"/>
  
          <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
              <field name="name">Overpassed Tasks</field>

diff --cc addons/project_long_term/project_view.xml
index eb968e3,eb968e3..b2219f8
--- 1/addons/project_long_term/project_view.xml
--- 2/addons/project_long_term/project_view.xml
+++ b/addons/project_long_term/project_view.xml
@@@ -92,10 -92,10 +92,9 @@@
          res_model="project.task"
          src_model="project.phase"
          view_mode="tree,form"
--        domain="[('phase_id','=',active_id)]"/>
--        
--        <menuitem id="project.menu_all_project" parent="project.menu_main" name="Projects"/>
--        <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_all_project"/>
++        domain="[('phase_id','=',active_id)]"/>        
++
++        <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/>
  
  
      </data>

diff --cc addons/resource/resource_view.xml
index 80d0650,d9dc719..2c53237
--- 1/addons/resource/resource_view.xml
--- 2/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@@ -1,18 -1,17 +1,17 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <openerp>
      <data>
-         <menuitem icon="terp-hr" id="menu_resource_root" name="Resources Management"/>
-         <menuitem
-             id="menu_resource_reporting"
-             name="Reporting"
-             parent="menu_resource_root"
-             sequence="40" />
-         <menuitem
-             id="menu_resource_configuration"
-             name="Configuration"
-             parent="menu_resource_root"
-             sequence="5"/>
- 
 -        <menuitem icon="terp-hr" id="base.menu_resource_root" name="Resources Management"/>
++<!--        <menuitem icon="terp-hr" id="base.menu_resource_root" name="Resources Management"/> -->
+ <!--        <menuitem-->
+ <!--            id="menu_resource_reporting"-->
+ <!--            name="Reporting"-->
+ <!--            parent="menu_resource_root"-->
+ <!--            sequence="40" />-->
+ <!--        <menuitem-->
+ <!--            id="menu_resource_configuration"-->
+ <!--            name="Configuration"-->
+ <!--            parent="menu_resource_root"-->
+ <!--            sequence="5"/>-->
  
          <record id="resource_calendar_form" model="ir.ui.view">
              <field name="name">resource.calendar.form</field>
@@@ -130,7 -129,7 +129,9 @@@
              <field name="res_model">resource.resource</field>
              <field name="view_mode">tree,form</field>
          </record>
-         <menuitem action="action_resource_resource_tree" id="menu_resource_resource_tree" parent="menu_resource_root"/>
 -<!--        <menuitem action="action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="menu_resource_root" />-->
++        <menuitem icon="terp-project" id="base.menu_main" name="Project Management"/>
++        <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/>
++        <menuitem action="action_resource_resource_tree" id="base.menu_resource_resource_tree" parent="base.menu_pm_planning" />
  
          <record id="resource_calendar_leave_form" model="ir.ui.view">
              <field name="name">resource.calendar.leaves.form</field>