From 8dc623fb21096992df22c20a8dcbe845e2a14b7c Mon Sep 17 00:00:00 2001
From: "Jagdish Panchal (Open ERP)" <jap@tinyerp.com>
Date: Thu, 22 Mar 2012 18:08:23 +0530
Subject: [PATCH] [IMP] HR: change sequence of menus and apply group_no_one

bzr revid: jap@tinyerp.com-20120322123823-gpn075d2e09etchq
---
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_view.xml                         | 10 +++++-----
 addons/hr_attendance/hr_attendance_view.xml   |  6 +++---
 addons/hr_contract/hr_contract_view.xml       |  4 ++--
 addons/hr_evaluation/hr_evaluation_view.xml   |  4 ++--
 addons/hr_holidays/hr_holidays_view.xml       |  2 +-
 addons/hr_payroll/hr_payroll_view.xml         | 11 ++++-------
 addons/hr_recruitment/hr_recruitment_view.xml |  9 ++++-----
 8 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index a48103ad2e0..0171b41e881 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -55,7 +55,7 @@
             <field name="help">Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
         </record>
 
-       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_management" sequence="6" />
+       <menuitem action="open_module_tree_department" id="menu_hr_department_tree" parent="hr.menu_hr_configuration" sequence="5"/>
 
        <record model="ir.ui.view" id="view_users_form_inherit">
             <field name="name">res.users.form</field>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f3751b41c9e..bc133ac9d5a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -8,7 +8,7 @@
             groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
         <menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
         <menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
-        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="1"/>
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25" groups="base.group_no_one"/>
         <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
 
         <!--
@@ -313,7 +313,7 @@
         </record>
 
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
-            parent="menu_view_employee_category_configuration_form" sequence="1"/>
+            parent="hr.menu_hr_configuration" sequence="1"/>
 
         <record id="open_view_categ_tree" model="ir.actions.act_window">
             <field name="name">Categories structure</field>
@@ -339,8 +339,8 @@
             <field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
         </record>
 
-        <menuitem action="open_view_categ_tree" groups="base.group_no_one"
-            id="menu_view_employee_category_tree" parent="menu_view_employee_category_configuration_form" sequence="2"/>
+        <menuitem action="open_view_categ_tree"
+            id="menu_view_employee_category_tree" parent="menu_hr_management" sequence="2"/>
 
         <record id="view_hr_job_form" model="ir.ui.view">
             <field name="name">hr.job.form</field>
@@ -434,7 +434,7 @@
         </record>
 
         <menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
-        <menuitem parent="hr.menu_view_employee_category_configuration_form" id="menu_hr_job" action="action_hr_job" sequence="2" groups="base.group_no_one"/>
+        <menuitem parent="hr.menu_hr_management" id="menu_hr_job" action="action_hr_job" sequence="6"/>
 
     </data>
 </openerp>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 8815e572ae9..e4407f37b2a 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -117,9 +117,9 @@
         </record>
 
         <menuitem
-            sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
-            groups="base.group_extended"/>
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" groups="base.group_no_one"/>
+            sequence="35" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Attendance"
+            groups="base.group_no_one"/>
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config" />
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index d19d71a5979..9e0017fed8c 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5"/>
+        <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_configuration" sequence="30" groups="base.group_no_one"/>
         <record id="hr_hr_employee_view_form2" model="ir.ui.view">
             <field name="name">hr.hr.employee.view.form2</field>
             <field name="model">hr.employee</field>
@@ -176,7 +176,7 @@
             <field name="search_view_id" ref="hr_contract_type_view_search"/>
         </record>
 
-        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6" groups="base.group_no_one"/>
+        <menuitem action="action_hr_contract_type" id="hr_menu_contract_type" parent="next_id_56" sequence="6"/>
         <menuitem action="action_hr_contract" id="hr_menu_contract" parent="hr.menu_hr_main" name="Contracts" sequence="4" groups="base.group_hr_manager"/>
 
         <!-- Contracts Button on Employee Form -->
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e5107c7b720..fbb408f1029 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -64,8 +64,8 @@
 
         <menuitem name="Appraisal" parent="hr.menu_hr_root" id="menu_eval_hr" sequence="6"/>
         <menuitem name="Periodic Appraisal" 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"
-            action="open_view_hr_evaluation_plan_tree"/>
+        <menuitem parent="hr.menu_hr_configuration" id="menu_open_view_hr_evaluation_plan_tree"
+            action="open_view_hr_evaluation_plan_tree" sequence="15"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_plan_phase_form">
             <field name="name">hr_evaluation.plan.phase.form</field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 22d4d6e567d..5f0e2c313bc 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -442,7 +442,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_open_view_attendance_reason_config"/>
+        <menuitem name="Leave Type" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10" />
 
     <!-- holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 7a2ce7836a3..e82f9cf0991 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -3,7 +3,7 @@
     <data>
         <!-- Root Menus -->
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="9"/>
-        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll"/>
+        <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_no_one" sequence="45"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
         <!-- Employee View -->
@@ -138,8 +138,8 @@
         <menuitem
             id="menu_hr_payroll_structure_view"
             action="action_view_hr_payroll_structure_list_form"
-            parent="payroll_configure"
-            sequence="1"
+            parent="hr.menu_hr_configuration"
+            sequence="20"
         />
         <record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
             <field name="name">Salary Structures Hierarchy</field>
@@ -152,7 +152,6 @@
             id="menu_hr_payroll_structure_tree"
             action="action_view_hr_payroll_structure_tree"
             parent="payroll_configure"
-			groups="base.group_no_one"
             sequence="2"
             icon="STOCK_INDENT"
         />
@@ -482,7 +481,6 @@
             action="action_hr_salary_rule_category"
             parent="payroll_configure"
             sequence="11"
-            groups="base.group_no_one"
         />
         <record id="action_hr_salary_rule_category_tree_view" model="ir.actions.act_window">
             <field name="name">Salary Rule Categories Hierarchy</field>
@@ -496,7 +494,6 @@
             action="action_hr_salary_rule_category_tree_view"
             parent="payroll_configure"
             sequence="12"
-            groups="base.group_no_one"			
             icon="STOCK_INDENT"
         />
 
@@ -552,7 +549,7 @@
         <menuitem
             id="menu_action_hr_contribution_register_form"
             action="action_contribution_register_form"
-            parent="payroll_configure" groups="base.group_no_one"
+            parent="payroll_configure" 
             sequence="14"
         />
 
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a4b3af00b8d..a408caabe98 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -5,7 +5,7 @@
             id="menu_hr_recruitment_recruitment"
             name="Recruitment"
             parent="hr.menu_hr_configuration"
-            sequence="2"/>
+            sequence="40" />
 
     # ------------------------------------------------------
     # Job Categories
@@ -417,7 +417,7 @@
         name="Stages"
         parent="menu_hr_recruitment_recruitment"
         action="hr_recruitment_stage_act"
-        sequence="1" groups="base.group_no_one"/>
+        sequence="1"/>
 
 <!-- Degree Tree View -->
 
@@ -461,7 +461,7 @@
             name="Degrees"
             parent="menu_hr_recruitment_recruitment"
             action="hr_recruitment_degree_action"
-            sequence="1" groups="base.group_no_one"/>
+            sequence="5" groups="base.group_no_one"/>
 
 <!-- Source Tree View -->
 
@@ -495,8 +495,7 @@
             id="menu_hr_recruitment_source"
             parent="menu_hr_recruitment_recruitment"
             action="hr_recruitment_source_action"
-			groups="base.group_no_one"
-            sequence="1"/>
+            sequence="10" groups="base.group_no_one"/>
 
 
     </data>