diff options
| author | vra <vra@tinyerp.com> | 2010-06-18 10:51:16 +0530 |
|---|---|---|
| committer | vra <vra@tinyerp.com> | 2010-06-18 10:51:16 +0530 |
| commit | 22ca2fd8399d53e72ea1045b288fadd758fcc98b (patch) | |
| tree | 640106424dcfe16cc280ccf8669baf6767298853 /addons/project_long_term | |
| parent | bf8d2a73c06154918874220b8bfb1251dc614088 (diff) | |
| parent | b8bc3af4d81819234fda1904ead95f121968ad4d (diff) | |
[MERGE] Merge the changes from main trunk branch.
bzr revid: vra@tinyerp.com-20100618052116-lbcdxkqh4cqv1xlt
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/project_long_term_view.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index cafaefa9633..a63449abf85 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -2,7 +2,7 @@ <openerp> <data> - <menuitem id="menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/> + <menuitem id="base.menu_project_long_term" name="Long Term Planning" parent="base.menu_main_pm" sequence="1"/> # ------------------------------------------------------ # Project Resource Allocation @@ -292,18 +292,18 @@ <menuitem action="act_project_phase" groups="base.group_extended" - id="menu_project_phase" parent="menu_project_long_term" sequence="4"/> + id="menu_project_phase" parent="base.menu_project_long_term" sequence="1"/> <menuitem id="menu_resouce_allocation" action="act_resouce_allocation" - name="Resource Allocations" parent="menu_project_long_term" /> + name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/> <!--<menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/>--> <menuitem id="menu_pm_resources_project1" groups="base.group_extended" - name="Resources" parent="base.menu_main_pm" sequence="2"/> + name="Resources" parent="project.menu_definitions" sequence="3"/> - <menuitem id="menu_phase_schedule" name="Scheduling" parent="menu_project_long_term"/> - <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="1"/> + <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_project_long_term" sequence="4"/> + <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="project.menu_project_management" sequence="4"/> <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/> <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/> |