From 0dbc10bf6c766f69c103868a7bcd8b136d114f36 Mon Sep 17 00:00:00 2001
From: "AMP (OpenERP)" <amp@tinyerp.com>
Date: Wed, 8 Sep 2010 14:32:29 +0530
Subject: [PATCH] [MOD]hr_* : usability improvement in menuitem

bzr revid: amp@tinyerp.com-20100908090229-v4qvmjkfp00ymn0f
---
 addons/hr_contract/hr_contract_view.xml     | 6 +++---
 addons/hr_evaluation/hr_evaluation_view.xml | 4 ++--
 addons/hr_holidays/hr_holidays_view.xml     | 2 +-
 addons/hr_payroll/hr_payroll_view.xml       | 8 +-------
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 3cfa8c62bd9..32705a3a92e 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -49,7 +49,7 @@
         </record>
 
         <record id="action_hr_contract_wage_type" model="ir.actions.act_window">
-            <field name="name">Contract Wage Type</field>
+            <field name="name">Wage Type</field>
             <field name="res_model">hr.contract.wage.type</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -58,7 +58,7 @@
         </record>
 
         <menuitem id="next_id_56" name="Contract" parent="hr.menu_hr_management" sequence="5" groups="base.group_system"/>
-        <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56"/>
+        <menuitem action="action_hr_contract_wage_type" id="hr_menu_contract_wage_type" parent="next_id_56" sequence="7"/>
 
         <record id="hr_contract_wage_type_period_view_form" model="ir.ui.view">
             <field name="name">hr.contract.wage.type.period.view.form</field>
@@ -272,7 +272,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"/>
+        <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"/>
 
         <!-- Contracts Button on Employee Form -->
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index fae0c0ef288..6ae1e473110 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -258,7 +258,7 @@
         </record>
 
         <record model="ir.actions.act_window" id="open_view_hr_evaluation_tree">
-            <field name="name">Evaluation</field>
+            <field name="name">Evaluations</field>
             <field name="res_model">hr_evaluation.evaluation</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,graph</field>
@@ -266,7 +266,7 @@
             <field name="help">Each employee can be assigned to an evaluation plan. These plans define the frequency and the way you manage your periodic personnal evaluation. You will be able to define steps and attach interview forms to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self evaluation and final evaluation by the manager.</field>
         </record>
 
-        <menuitem name="Evaluation" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
+        <menuitem name="Evaluations" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
             action="open_view_hr_evaluation_tree"/>
 
         <record model="ir.ui.view" id="view_hr_evaluation_interview_form">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 1e5ab7a001c..9ba21292d32 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -359,7 +359,7 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" groups="base.group_system"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Holidays" groups="base.group_system"/>
         <menuitem name="Leave Type"
             action="open_view_holiday_status"
             id="menu_open_view_holiday_status"
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 90728585943..1e8f7e5b476 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <!-- Root Menus -->
-        <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" groups="base.group_system,group_hr_payroll"/>
+        <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" groups="base.group_system,group_hr_payroll" sequence="9"/>
         <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_system"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
@@ -84,12 +84,6 @@
             <field name="view_id" ref="hr_passport_tree"/>
             <field name="search_view_id" ref="view_hr_passport_filter"/>
         </record>
-        <menuitem id="passport_configure" parent="hr.menu_hr_configuration" name="Passport"/>
-        <menuitem
-            id="menu_action_hr_passport_tree"
-            action="action_hr_passport_tree"
-            parent="passport_configure"
-        />
         <!-- End Passport Views -->
 
         <!-- Employee View -->