[IMP] project, project_timesheet:- added 'Projects' menu and removed 'Timesheets...

bzr revid: mtr@tinyerp.com-20120305103909-27pjpsv7hyqf4nch

diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0116106..d1e6c26 100644 (file)
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -627,7 +627,7 @@
         <menuitem id="menu_project_config_project" name="Projects and Stages" parent="menu_definitions" sequence="1"/>
 
         <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/>
-        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1"/>
+        <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_management" sequence="1"/>
 
         <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
 

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index f4e01c6..0412bda 100644 (file)
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -120,19 +120,5 @@ the project form.</field>
         <menuitem id="menu_invoicing_contracts" parent="menu_project_billing" sequence="4"
             action="account_analytic_analysis.action_account_analytic_overdue"/>
 
-        <!-- Timesheets by project -->
-
-        <record id="act_hr_timesheet_sheet_sheet_by_project" model="ir.actions.act_window">
-            <field name="name">Timesheets by Project</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">hr_timesheet_sheet.sheet.account</field>
-            <field name="view_type">form</field>
-            <field name="view_id" eval="False"/>
-            <field name="context">{}</field>
-            <field name="search_view_id" ref="hr_timesheet_sheet.hr_timesheet_account_filter"/>
-        </record>
-
-        <menuitem id="menu_timesheet_projects" parent="project.menu_project_management" sequence="20"
-            action="act_hr_timesheet_sheet_sheet_by_project"/>
     </data>
 </openerp>