diff options
33 files changed, 134 insertions, 89 deletions
diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index b83ce33596d..821f7180e2e 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -1,8 +1,8 @@ <openerp> <data> <menuitem icon="terp-project" id="base.menu_main_pm" name="Project Management" sequence="1"/> - <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="Billing" parent="next_id_71" 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="Billing" parent="base.menu_main_pm" sequence="4"/> <record id="action_hr_tree_invoiced_all" model="ir.actions.act_window"> <field name="name">All Uninvoiced Entries</field> @@ -23,7 +23,7 @@ <field name="search_view_id" ref="account.view_account_analytic_account_search"/> <field name="domain">[]</field> </record> - <menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/> +<!-- <menuitem name="Analytic Accounts" action="action_account_analytic_all" id="menu_action_account_analytic_all" parent="next_id_71"/>--> <record id="action_account_analytic_managed_overpassed" model="ir.actions.act_window"> <field name="name">Overpassed Accounts</field> diff --git a/addons/base_contact/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 04429a94186..2145123599c 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -122,6 +122,18 @@ <field name="search_view_id" ref="view_partner_contact_search"/> </record> <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" parent = "base.menu_address_book" sequence="2"/> + + <!-- + Contacts for Suppliers + --> + <menuitem icon="terp-purchase" id="base.menu_purchase_root" name="Purchases" + sequence="7"/> + <menuitem id="base.menu_procurement_management_supplier" name="Address Book" + parent="base.menu_purchase_root" sequence="3"/> + <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers" + parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/> + <menuitem name="Contacts" id="menu_partner_contact_form" action="action_partner_contact_form" + parent = "base.menu_procurement_management_supplier" sequence="2"/> <!-- Views for Partners Form View --> diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index f6a03030a6f..4adb8c3488b 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -9,7 +9,7 @@ <menuitem id="menu_hr_main" parent="menu_hr_root" - name="Human Resources" + name="Human Resources Management" sequence="0"/> <menuitem id="menu_hr_configuration" @@ -18,8 +18,14 @@ groups="group_hr_manager" sequence="50" /> <menuitem - id="menu_view_employee_category_configuration_form" + id="menu_hr_management" + name="Human Resources Management" parent="hr.menu_hr_configuration" + groups="group_hr_manager" + sequence="1" /> + <menuitem + id="menu_view_employee_category_configuration_form" + parent="hr.menu_hr_management" name="Employees" sequence="1"/> diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index e3db974ebb5..091723d7604 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -77,9 +77,9 @@ <menuitem id="menu_hr_time_tracking" name="Time Tracking" - parent="hr.menu_hr_root" sequence="7"/> + parent="hr.menu_hr_root" sequence="3"/> <menuitem action="open_view_attendance" id="menu_open_view_attendance" - parent="menu_hr_time_tracking" groups="hr.group_hr_manager"/> + parent="menu_hr_time_tracking" groups="hr.group_hr_manager" sequence="3"/> <record id="edit_attendance_reason" model="ir.ui.view"> <field name="name">hr.action.reason.form</field> diff --git a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml index 443983dffe7..a7a39312aff 100644 --- a/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_sign_in_out_view.xml @@ -46,7 +46,7 @@ <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out" - parent="menu_hr_time_tracking"/> + parent="menu_hr_time_tracking" sequence="4"/> <record id="view_hr_attendance_so_ask" model="ir.ui.view"> <field name="name">hr.sign.in.out.ask.form</field> diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 0b92bcc986a..e1135a9f058 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -48,7 +48,7 @@ <field name="domain">[]</field> </record> - <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="5"/> + <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/> <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/> diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index cbb4c796c90..5784bb4d868 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -64,7 +64,7 @@ <menuitem name="Evaluations" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/> <menuitem - name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="3"/> + name="Periodic Evaluations" parent="hr.menu_hr_configuration" id="menu_eval_hr_config" sequence="4"/> <menuitem parent="menu_eval_hr_config" id="menu_open_view_hr_evaluation_plan_tree" diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index cafe42fcffa..9c5ebf49953 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -171,7 +171,7 @@ <field name="search_view_id" ref="view_hr_expense_filter"/> </record> - <menuitem id="next_id_49" name="Expenses" sequence="8" + <menuitem id="next_id_49" name="Expenses" sequence="4" parent="hr.menu_hr_root"/> <menuitem action="expense_all" id="menu_expense_all" name="Expenses" diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index bcc560573ab..1322b5a241d 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -134,7 +134,7 @@ </record> <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/> - <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="1"/> + <menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/> </data> </openerp> diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 1a310a55100..98c8d558f3a 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -245,7 +245,7 @@ name="Holidays Management" parent="hr.menu_hr_root" id="menu_open_ask_holidays" - sequence="9"/> + sequence="5"/> <record model="ir.actions.act_window" id="open_ask_holidays"> <field name="name">Leave Requests</field> @@ -362,7 +362,7 @@ <field name="view_mode">tree,form</field> </record> - <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/> + <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/> <menuitem name="Leave Status" action="open_view_holiday_status" id="menu_open_view_holiday_status" diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index ef5fcd3387f..09f8cee6314 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -2,12 +2,6 @@ <openerp> <data> - <menuitem - id="menu_hr_config_applicant" - name="Applicant" - parent="hr.menu_hr_configuration" - /> - # ------------------------------------------------------ # Job Categories # ------------------------------------------------------ @@ -323,8 +317,12 @@ id="menu_hr_recruitment_recruitment" name="Recruitment" parent="hr.menu_hr_configuration" - /> - + sequence="2"/> + <menuitem + id="menu_hr_config_applicant" + name="Applicant" + parent="menu_hr_recruitment_recruitment" + sequence="2"/> <menuitem id="menu_hr_recruitment_stage" name="Stages" diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 4fca4a8b239..fb000d68aa3 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -129,7 +129,7 @@ <field name="search_view_id" ref="view_hr_recruitment_report_search"/> </record> <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/> - <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="2"/> + <menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/> </data> </openerp> diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml index 9b37db8b0c6..a3723d2adba 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml @@ -34,7 +34,7 @@ <menuitem action="action_hr_timesheet_employee" id="menu_hr_timesheet_employee" parent="menu_hr_reporting_timesheet" - groups="base.group_extended"/> + groups="base.group_extended" sequence="2" icon="STOCK_PRINT"/> <!-- Print My Timesheet --> @@ -68,7 +68,7 @@ <menuitem action="action_hr_timesheet_my" id="menu_hr_timesheet_my" parent="menu_hr_reporting_timesheet" - groups="hr.group_hr_user" /> + groups="hr.group_hr_user" sequence="4" icon="STOCK_PRINT"/> </data> </openerp> diff --git a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml index de834621c23..2d2af2a4769 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml @@ -34,7 +34,7 @@ <menuitem action="action_hr_timesheet_users" id="menu_hr_timesheet_users" parent="menu_hr_reporting_timesheet" - groups="hr.group_hr_manager" /> + groups="hr.group_hr_manager" sequence="3" icon="STOCK_PRINT"/> </data> diff --git a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml index 6f6ce56b091..099eb0d4642 100644 --- a/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml +++ b/addons/hr_timesheet/wizard/hr_timesheet_sign_in_out_view.xml @@ -54,7 +54,7 @@ id="menu_hr_timesheet_sign_in" groups="base.group_extended" parent="hr_attendance.menu_hr_time_tracking" - /> + sequence="5" /> <record id="view_hr_timesheet_sign_out" model="ir.ui.view"> <field name="name">hr.sign.out.project.form</field> diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml index a801e21082b..b1a6cc0dc51 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml @@ -6,11 +6,11 @@ name="Reporting" parent="hr.menu_hr_root" sequence="10" /> - <menuitem - id="menu_hr_reporting_timesheet_invoice" - name="Timesheet Invoice" - parent="hr.menu_hr_reporting" - sequence="5" /> +<!-- <menuitem--> +<!-- id="menu_hr_reporting_timesheet_invoice"--> +<!-- name="Timesheet Invoice"--> +<!-- parent="hr.menu_hr_reporting"--> +<!-- sequence="5" />--> <report auto="False" id="account_analytic_account_cost_ledger" menu="False" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger" rml="account/project/report/cost_ledger.rml" string="Cost Ledger"/> <!--<wizard id="account_analytic_account_cost_ledger_report" keyword="client_print_multi" model="account.analytic.account" name="hr.timesheet.invoice.account.analytic.account.cost_ledger.report" string="Cost Ledger"/>--> diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index b3f81e5fbb1..516d624d050 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -512,6 +512,6 @@ id="menu_hr_action_random_timesheet_lines_board" name="Working Hours" parent="hr_attendance.menu_hr_time_tracking" - groups="hr.group_hr_manager"/> + groups="hr.group_hr_manager" sequence="2"/> </data> </openerp> diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml index b68112a5a38..16cf8cf8e8a 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml @@ -34,7 +34,7 @@ <menuitem action="action_hr_timesheet_analytic_profit" id="menu_hr_timesheet_analytic_profit" - parent="menu_hr_reporting_timesheet_invoice" groups="base.group_extended"/> + parent="hr_timesheet.menu_hr_reporting_timesheet" groups="base.group_extended" icon="STOCK_PRINT"/> </data> </openerp>
\ No newline at end of file diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index 51edeea837b..be60d24dc4a 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -227,12 +227,12 @@ <menuitem id="base.menu_project_management_time_tracking" name="Time Tracking" - parent="base.menu_main_pm" sequence="3"/> + parent="base.menu_main_pm" sequence="5"/> <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"/> + groups="hr.group_hr_manager" sequence="1"/> <!-- Company inheritancy diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 51e6b5d295c..7336a3a2049 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -121,6 +121,7 @@ <field name="context">{'search_default_month':1,'search_default_User_id':1,'group_by_no_leaf':1,'group_by':[]}</field> <field name="search_view_id" ref="view_timesheet_report_search"/> </record> - <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" parent="hr.menu_hr_reporting"/> + <menuitem action="action_timesheet_report_stat_all" id="menu_timesheet_report_all" + parent="hr_timesheet.menu_hr_reporting_timesheet" sequence="1"/> </data> </openerp> diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index b3004fffb2f..ef0b9a1adc7 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -4,7 +4,7 @@ <menuitem icon="terp-mrp" id="base.menu_mrp_root" name="Manufacturing" groups="group_mrp_user,group_mrp_manager" sequence="3"/> - <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="4"/> + <menuitem id="menu_mrp_reordering" name="Automatic Procurements" parent="stock.menu_stock_root" sequence="5"/> <menuitem id="menu_mrp_manufacturing" name="Manufacturing" parent="base.menu_mrp_root" sequence="1"/> <!-- <menuitem name="Control" id="menu_mrp_control" parent="base.menu_mrp_root" sequence="3" />--> @@ -78,7 +78,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> - <menuitem name="Properties" + <menuitem name="Master Bill of Materials" id="menu_mrp_property" parent="menu_mrp_configuration" groups="base.group_extended" @@ -230,8 +230,8 @@ </record> <!-- <menuitem name="Routings" id="menu_mrp_routing_and_workcenters" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="100" />--> - <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="40" /> - <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_bom" groups="base.group_extended" sequence="30"/> + <menuitem action="mrp_workcenter_action" id="menu_mrp_workcenter_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="40" /> + <menuitem action="mrp_routing_action" id="menu_mrp_routing_action" parent="mrp.menu_mrp_property" groups="base.group_extended" sequence="30"/> <!-- Bill of Materials @@ -415,11 +415,11 @@ --> <menuitem action="procurement.procurement_action" id="menu_mrp_procurement_action" - parent="mrp.menu_mrp_manufacturing" sequence="2" /> + parent="mrp.menu_mrp_manufacturing" sequence="3" /> <!-- <menuitem action="procurement.procurement_action5" id="menu_mrp_procurement_exception_action"--> <!-- parent="mrp.menu_mrp_control" sequence="1" />--> - <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="4"/> + <menuitem id="menu_mrp_scheduler" name="Schedulers" parent="base.menu_mrp_root" sequence="3"/> <menuitem action="procurement.action_compute_schedulers" id="mrp_Sched_all" parent="mrp.menu_mrp_scheduler" sequence="90"/> <!-- @@ -851,10 +851,11 @@ <menuitem id="menu_pm_resources_mrp" name="Resources" parent="base.menu_mrp_root" groups="base.group_extended" - sequence="2"/> + sequence="4"/> + <menuitem id="menu_pm_resources_config" name="Resources" parent="menu_mrp_configuration"/> <menuitem action="resource.action_resource_resource_tree" id="menu_view_resource_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/> - <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_mrp_configuration" sequence="1"/> - <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_mrp" sequence="1"/> + <menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar_search_mrp" parent="menu_pm_resources_config" sequence="1"/> + <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search_mrp" parent="menu_pm_resources_config" sequence="1"/> </data> </openerp> diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index a5c6564644e..bd3574d2608 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -206,7 +206,7 @@ <menuitem name="Work Orders" parent="mrp.menu_mrp_manufacturing" id="menu_mrp_production_wc_order" action="mrp_production_wc_action_form" - groups="base.group_extended"/> + groups="base.group_extended" sequence="2"/> <menuitem name="Work Orders" parent="menu_mrp_planning" id="menu_mrp_production_wc_action_planning" action="mrp_production_wc_action_planning" diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 004ed9ba429..04ee0b42df0 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -507,13 +507,14 @@ </record> <record id="open_task_type_form" model="ir.actions.act_window"> - <field name="name">Task Types</field> + <field name="name">Types</field> <field name="res_model">project.task.type</field> <field name="view_type">form</field> <field name="view_id" ref="task_type_tree"/> </record> - <menuitem action="open_task_type_form" id="menu_task_types" parent="project.menu_definitions"/> - + <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/> + <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/> + <act_window domain="[('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"/> <act_window diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 64f6bcdfbd1..f5639ea5629 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -30,8 +30,9 @@ <field name="res_model">project.gtd.context</field> </record> - <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/> - <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" parent="menu_open_gtd_time" action="open_gtd_context_tree"/> +<!-- <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions" groups="group_project_getting"/>--> + <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" + parent="project.menu_tasks_config" action="open_gtd_context_tree"/> <record model="ir.ui.view" id="view_gtd_timebox_tree"> <field name="name">project.gtd.timebox.tree</field> @@ -68,7 +69,7 @@ <field name="view_id" ref="view_gtd_timebox_tree"/> </record> - <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="menu_open_gtd_time" action="open_gtd_timebox_tree"/> + <menuitem name="Timeboxes" id="menu_open_gtd_time_timeboxes" parent="project.menu_tasks_config" action="open_gtd_timebox_tree"/> <record model="ir.ui.view" id="project_task_tree"> <field name="name">project.task.tree.timebox</field> <field name="model">project.task</field> diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index c9bb771a2ac..ea902ea599f 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -46,6 +46,7 @@ view_type="form"/> <!--<menuitem id="menu_aftertask" name="Bug" parent="project.menu_main" visible="False"/>--> - <menuitem name="Issues" id="menu_project_issue_track" parent="project.menu_project_management" action="project_issue_categ_act0"/> + <menuitem name="Issues" id="menu_project_issue_track" parent="project.menu_project_management" + action="project_issue_categ_act0" sequence="3"/> </data> </openerp> diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 673f4239971..973e0a1a20c 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -2,7 +2,7 @@ <openerp> <data> - <menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="1"/> + <menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/> <record id="project_issue_categ_action" model="ir.actions.act_window"> <field name="name">Issue Categories</field> 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"/> diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml index 1d55d9db6c4..fff11703de5 100644 --- a/addons/project_planning/project_planning_view.xml +++ b/addons/project_planning/project_planning_view.xml @@ -217,12 +217,12 @@ <field name="context">{"search_default_user_id":uid}</field> <field name="search_view_id" ref="account_analytic_planning_view_search"/> </record> - <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" /> +<!-- <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main_pm" sequence="5"/>--> + <menuitem id="base.menu_project_long_term" name="Long Term Planning" + parent="base.menu_main_pm" /> <menuitem action="action_account_analytic_planning_form" - id="menu_report_account_analytic_planning" parent="planning_main" /> + id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3"/> <!-- Planning statistics diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 3a7277a4766..6a8f5eb6f55 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -7,14 +7,36 @@ groups="group_purchase_user" sequence="7"/> <menuitem id="menu_procurement_management" name="Purchase Management" parent="base.menu_purchase_root" sequence="1"/> + + <!--supplier addresses action--> + <record id="action_supplier_address_form" model="ir.actions.act_window"> + <field name="name">Addresses</field> + <field name="type">ir.actions.act_window</field> + <field name="res_model">res.partner.address</field> + <field name="view_type">form</field> + <field name="context">{"search_default_supplier":1}</field> + <field name="search_view_id" ref="base.view_res_partner_address_filter"/> + </record> + <record id="action_supplier_address_form_view1" model="ir.actions.act_window.view"> + <field eval="10" name="sequence"/> + <field name="view_mode">tree</field> + <field name="view_id" ref="base.view_partner_address_tree"/> + <field name="act_window_id" ref="action_supplier_address_form"/> + </record> + <record id="action_supplier_address_form_view2" model="ir.actions.act_window.view"> + <field eval="20" name="sequence"/> + <field name="view_mode">form</field> + <field name="view_id" ref="base.view_partner_address_form1"/> + <field name="act_window_id" ref="action_supplier_address_form"/> + </record> <!--supplier menu--> - <menuitem id="base.menu_procurement_management_supplier" name="Suppliers" + <menuitem id="base.menu_procurement_management_supplier" name="Address Book" parent="base.menu_purchase_root" sequence="3"/> - <menuitem id="menu_procurement_management_supplier_name" name="Suppliers" + <menuitem id="base.menu_procurement_management_supplier_name" name="Suppliers" parent="base.menu_procurement_management_supplier" action="base.action_partner_supplier_form" sequence="1"/> - - + <menuitem action="action_supplier_address_form" id="menu_purchases_partner_address_form" + parent="base.menu_procurement_management_supplier" sequence="3"/> <!--Inventory control--> <menuitem id="menu_procurement_management_inventory" name="Inventory Control" @@ -27,7 +49,7 @@ <menuitem id="menu_procurement_management_invoice" name="Invoice Control" parent="base.menu_purchase_root" sequence="6"/> <menuitem name="Pending Invoices" id="menu_procurement_management_pending_invoice" action="account.action_invoice_tree_pending_invoice" - parent="menu_procurement_management_invoice"/> + parent="menu_procurement_management_invoice" sequence="13"/> <!--product menu--> <menuitem id="menu_procurement_management_product" name="Product" @@ -346,7 +368,8 @@ <field name="view_id" ref="purchase_order_line_form"/> <field name="act_window_id" ref="purchase_line_form_action2"/> </record> - <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" parent="menu_procurement_management_invoice"/> + <menuitem action="purchase_line_form_action2" id="menu_purchase_line_order_draft" + parent="menu_procurement_management_invoice" sequence="12"/> <!-- Procurements diff --git a/addons/sale_journal/sale_journal_view.xml b/addons/sale_journal/sale_journal_view.xml index 5b3d2de5652..86299968f4b 100644 --- a/addons/sale_journal/sale_journal_view.xml +++ b/addons/sale_journal/sale_journal_view.xml @@ -439,7 +439,7 @@ <field name="search_view_id" ref="view_picking_journal_search"/> </record> - <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_stock_configuration" action="action_definition_picking_journal"/> + <menuitem name="Picking Journals" id="menu_definition_journal_picking" parent="stock.menu_warehouse_config" action="action_definition_picking_journal"/> <record model="ir.actions.act_window" id="action_invoice_type_tree"> <field name="name">Picking by invoice_method</field> diff --git a/addons/scrum/scrum_view.xml b/addons/scrum/scrum_view.xml index 70c3e82ee56..46ce72c2f0a 100644 --- a/addons/scrum/scrum_view.xml +++ b/addons/scrum/scrum_view.xml @@ -4,7 +4,7 @@ <menuitem id="menu_scrum" name="Scrum" - parent="base.menu_main_pm"/> + parent="base.menu_main_pm" sequence="3"/> <!-- Scrum Project --> @@ -172,7 +172,7 @@ <menuitem action="action_product_backlog_form" id="menu_action_product_backlog_form" - sequence="20" + sequence="10" parent="menu_scrum"/> <!-- @@ -293,7 +293,7 @@ <field name="search_view_id" ref="view_scrum_sprint_search"/> </record> <menuitem - sequence="10" + sequence="30" action="action_sprint_all_tree" id="menu_action_sprint_all_tree" parent="menu_scrum"/> <!-- @@ -375,7 +375,7 @@ <field name="context">{'search_default_scrum_daily':1}</field> <field name="search_view_id" ref="view_scrum_meeting_search"/> </record> - <menuitem sequence="30" + <menuitem sequence="20" action="action_meeting_form" id="menu_action_meeting_form" parent="menu_scrum"/> <!-- diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3fdfda9e057..1011f88f577 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -3,11 +3,12 @@ <data> <menuitem icon="terp-stock" id="menu_stock_root" name="Warehouse" sequence="2"/> <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/> - <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="5"/> - <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="4"/> + <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="7"/> + <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/> <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/> <menuitem id="menu_stock_configuration" name="Configuration" parent="menu_stock_root" sequence="15"/> - <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="3"/> + <menuitem id="menu_warehouse_config" name="Warehouse mangement" parent="menu_stock_configuration" sequence="1"/> + <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/> <record id="stock_inventory_line_tree" model="ir.ui.view"> <field name="name">stock.inventory.line.tree</field> @@ -181,7 +182,7 @@ <field name="view_type">form</field> <field name="view_id" ref="view_tracking_tree"/> </record> - <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="2"/> + <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" sequence="3"/> <menuitem action="action_tracking_form" id="menu_action_tracking_form" groups="base.group_extended" parent="menu_traceability"/> @@ -481,7 +482,7 @@ <field name="view_id" ref="view_location_tree2"/> <field name="context">{'full':1, 'search_default_in_location':1}</field> </record> - <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_stock_configuration" /> + <menuitem action="action_location_form" id="menu_action_location_form" parent="menu_warehouse_config" /> <record id="view_location_tree" model="ir.ui.view"> <field name="name">stock.location.tree</field> @@ -541,7 +542,7 @@ <field name="view_type">form</field> <field name="view_id" ref="view_warehouse_tree"/> </record> - <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_stock_configuration"/> + <menuitem action="action_warehouse_form" id="menu_action_warehouse_form" parent="menu_warehouse_config"/> <record id="stock_picking_move_wizard_form" model="ir.ui.view"> <field name="name">stock.picking.move.wizard.form</field> @@ -933,7 +934,7 @@ <field name="view_mode">calendar</field> <field name="act_window_id" ref="action_picking_tree_delivery"/> </record> - <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="20"/> + <menuitem action="action_picking_tree_delivery" id="menu_action_picking_tree_delivery" parent="menu_stock_warehouse_mgmt" sequence="1"/> # # Sending Products @@ -1126,7 +1127,7 @@ <field name="view_mode">calendar</field> <field name="act_window_id" ref="action_picking_tree"/> </record> - <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="5"/> + <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="3"/> <record id="view_picking_in_tree" model="ir.ui.view"> <field name="name">stock.picking.in.tree</field> @@ -1308,7 +1309,7 @@ <field name="view_mode">calendar</field> <field name="act_window_id" ref="action_picking_tree4"/> </record> - <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="1"/> + <menuitem action="action_picking_tree4" id="menu_action_picking_tree4" parent="menu_stock_warehouse_mgmt" sequence="2"/> <record id="view_picking_internal_search" model="ir.ui.view"> <field name="name">stock.picking.internal.search</field> @@ -1347,7 +1348,7 @@ <field name="context">{'contact_display': 'partner',"search_default_confirmed":1}</field> <field name="search_view_id" ref="view_picking_internal_search"/> </record> - <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="2"/> + <menuitem action="action_picking_tree6" id="menu_action_picking_tree6" parent="menu_stock_warehouse_mgmt" sequence="4"/> <record id="view_move_tree" model="ir.ui.view"> <field name="name">stock.move.tree</field> @@ -1699,7 +1700,7 @@ <field name="view_type">form</field> <field name="view_mode">tree,form</field> </record> -<!-- <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_stock_configuration"/>--> +<!-- <menuitem action="action_incoterms_tree" id="menu_action_incoterms_tree" parent="menu_warehouse_config"/>--> <act_window context="{'location': active_id}" @@ -1923,7 +1924,7 @@ action="action_stock_journal_form" id="menu_action_stock_journal_form" groups="base.group_extended" - parent="menu_stock_configuration" /> + parent="menu_warehouse_config" /> </data> </openerp> diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml index 7eb19f8863c..027ba285193 100644 --- a/addons/stock_planning/stock_planning_view.xml +++ b/addons/stock_planning/stock_planning_view.xml @@ -267,7 +267,7 @@ <!-- Create Planning section --> - <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root"/> + <menuitem id="menu_stock_planning_main" name="Stock Planning" parent="stock.menu_stock_root" sequence="2"/> <record id="view_stock_planning_createlines_form" model="ir.ui.view"> <field name="name">stock.planning.createlines.form</field> |