diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
index b6f76777f54..1f41411409e 100644
--- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml
+++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml
@@ -90,7 +90,7 @@
-
+
diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml
index 1299f4e9ce5..346378a05ae 100644
--- a/addons/hr_expense/report/hr_expense_report_view.xml
+++ b/addons/hr_expense/report/hr_expense_report_view.xml
@@ -97,7 +97,7 @@
- Expenses Analysis
+ Expense Analysis
hr.expense.report
form
tree,graph
@@ -105,7 +105,7 @@
-
+
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 09809e488ba..6f9f61afabc 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -58,7 +58,6 @@ Note that:
'hr_holidays_workflow.xml',
'hr_holidays_view.xml',
'hr_holidays_data.xml',
- 'hr_holidays_wizard.xml',
'hr_holidays_report.xml',
'report/hr_holidays_report_view.xml',
'report/available_holidays_view.xml',
diff --git a/addons/hr_holidays/hr_holidays_wizard.xml b/addons/hr_holidays/hr_holidays_wizard.xml
deleted file mode 100644
index 7ed381636cf..00000000000
--- a/addons/hr_holidays/hr_holidays_wizard.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
diff --git a/addons/hr_holidays/hr_holidays_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
deleted file mode 100644
index 7013d62a5ed..00000000000
--- a/addons/hr_holidays/hr_holidays_workflow.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
- hr.wkf.holidays
- hr.holidays
- True
-
-
-
-
- True
- draft
-
-
-
-
- confirm
- function
- holidays_confirm()
- OR
-
-
-
-
- validate
- function
- holidays_validate()
-
-
-
-
- second_validate
- function
- holidays_validate2()
-
-
-
-
-
- refuse
- True
- stopall
-
-
-
-
-
-
-
- confirm
-
-
-
-
-
- validate
- True
-
-
-
-
-
-
- refuse
- holidays_refuse('first_approval')
-
-
-
-
-
-
- refuse
- holidays_refuse('second_approval')
-
-
-
-
-
-
- second_validate
-
-
-
-
-
-
- not holiday_status_id.double_validation
-
-
-
-
-
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index 082bf198e34..e7441060204 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -17,7 +17,7 @@
name="Leaves Analysis"
id="menu_hr_available_holidays_report_tree"
action="action_hr_available_holidays_report"
- parent="menu_hr_reporting_holidays"/>
+ parent="hr.menu_hr_reporting" sequence="5" />
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index 72844a58ccb..d2518a0d7f7 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -32,7 +32,7 @@
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 5ddbe5045ab..9d81d39f240 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -114,7 +114,7 @@
{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}
-
+
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index d3d2d745183..ab24066b1de 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -3,9 +3,9 @@
+ sequence="6" />
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 1eda6de05cb..ae7de4c03c7 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_employee_view.xml
@@ -2,43 +2,7 @@
-
-
- hr.analytical.timesheet.employee.form
- hr.analytical.timesheet.employee
- form
-
-
-
-
-
-
- Employee Timesheet
- hr.analytical.timesheet.employee
- form
- tree,form
-
- new
-
-
-
-
-
-
+
hr.analytical.timesheet.my.form
hr.analytical.timesheet.employee
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 95b7bd3b93e..69fc0f04188 100644
--- a/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
+++ b/addons/hr_timesheet/wizard/hr_timesheet_print_users_view.xml
@@ -8,20 +8,25 @@
hr.analytical.timesheet.users
form
-
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 56c18c82b7a..014361dfbde 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
@@ -7,23 +7,26 @@
hr.timesheet.analytic.profit
form
-
+
diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
index 8b102b19f72..fd5d6b0b6d1 100644
--- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml
@@ -82,6 +82,6 @@
+ parent="hr.menu_hr_reporting" sequence="3"/>
diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
index fe497b6f46c..613f92d3cf6 100644
--- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
+++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml
@@ -110,6 +110,6 @@
+ parent="hr.menu_hr_reporting" sequence="4" groups="base.group_hr_manager"/>
diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml
index 69daeefc758..f1992b19965 100644
--- a/addons/project/report/project_cumulative.xml
+++ b/addons/project/report/project_cumulative.xml
@@ -83,7 +83,7 @@
+ parent="base.menu_project_report" />
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a5711239f87..40537a34fb7 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -5,8 +5,6 @@
-
report.project.task.user.tree
@@ -135,7 +133,7 @@
This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.
-
+