odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] branch merged with trunk-reorganise-menus-project-mtr 

bzr revid: mtr@tinyerp.com-20120229131133-850btysyvk267qld
This commit is contained in:
Meera Trambadia (OpenERP) 2012-02-29 18:41:33 +05:30
parent e543b9a8fb 675e5ab272
commit 549673559c
4 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/project_messages/project_messages_view.xml
View File

@ -100,6 +100,6 @@
<field name="view_mode">tree,form</field>
<field name="view_id" ref="project_messages.view_project_message_tree"/>
</record>
<menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management" groups="project.group_project_user"/>
<!--<menuitem action="messages_form" id="menu_messages_form" parent="project.menu_project_management" groups="project.group_project_user"/> -->
</data>
</openerp>

2
addons/project_scrum/project_scrum_view.xml
View File

@ -4,7 +4,7 @@
<menuitem id="menu_scrum"
name="Scrum"
parent="base.menu_main_pm" sequence="3"/>
parent="base.menu_main_pm" sequence="7"/>
<!-- Scrum Project -->

8
addons/project_timesheet/project_timesheet_data.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<openerp>
<data>
<record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
<!-- <record id="base.menu_project_management_time_tracking" model="ir.ui.menu">
<field name="name">Time Tracking</field>
<field eval="5" name="sequence"/>
<field name="parent_id" ref="base.menu_main_pm"/>
@ -14,7 +14,7 @@
<field name="parent_id" ref="base.menu_project_management_time_tracking"/>
<field name="icon">STOCK_JUSTIFY_FILL</field>
<field name="action" ref="hr_timesheet_sheet.ir_actions_server_timsheet_sheet"/>
</record>
</record> -->
</data>
</openerp>

18
addons/project_timesheet/project_timesheet_view.xml
View File

@ -101,11 +101,11 @@ the project form.</field>
parent="base.menu_main_pm" sequence="5"/>
<menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
<!--
Time Tracking menu in project Management
-->
<menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/>
<!-- <menuitem id="menu_project_working_hours" parent="base.menu_project_management_time_tracking" action="hr_timesheet.act_hr_timesheet_line_evry1_all_form"/> -->
<record id="action_account_analytic_overdue" model="ir.actions.act_window">
<field name="name">Customer Projects</field>
@ -120,5 +120,19 @@ 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="4"
action="act_hr_timesheet_sheet_sheet_by_project"/>
</data>
</openerp>