[IMP] Update menu name and remove Human Resources menu.

bzr revid: vba@tinyerp.com-20121119054246-16gvypp9hp4e8mhs

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 8918c50..955737c 100644 (file)
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -9,7 +9,6 @@
             sequence="110"/>
         <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" groups="base.group_no_one" sequence="25"/>
         <menuitem id="menu_hr_reporting_timesheet" name="Reports"
             parent="menu_hr_reporting" sequence="6"/>
 
@@ -288,7 +287,7 @@
         </record>
 
         <record id="open_view_categ_form" model="ir.actions.act_window">
-            <field name="name">Categories of Employees</field>
+            <field name="name">Employee tags</field>
             <field name="res_model">hr.employee.category</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -297,14 +296,6 @@
         <menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
             parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one"/>
 
-        <record id="open_view_categ_tree" model="ir.actions.act_window">
-            <field name="name">Categories Structure</field>
-            <field name="res_model">hr.employee.category</field>
-            <field name="view_type">tree</field>
-            <field name="view_id" ref="view_employee_category_tree"/>
-            <field name="domain">[('parent_id','=',False)]</field>
-        </record>
-
         <record id="hr_employee_normal_action_tree" model="ir.actions.act_window">
             <field name="name">Employees</field>
             <field name="type">ir.actions.act_window</field>
@@ -321,9 +312,6 @@
             <field eval="'ir.actions.act_window,%d'%hr_employee_normal_action_tree" name="value"/>
         </record>
 
-        <menuitem action="open_view_categ_tree"
-            id="menu_view_employee_category_tree" parent="menu_hr_management" groups="base.group_no_one" sequence="2"/>
-
         <record id="view_hr_job_form" model="ir.ui.view">
             <field name="name">hr.job.form</field>
             <field name="model">hr.job</field>

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 752d278..d9c5192 100644 (file)
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -297,7 +297,7 @@
             <field name="act_window_id" ref="open_ask_holidays"/>
         </record>
 
-        <menuitem name="My Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
+        <menuitem name="Leave Requests" parent="menu_open_ask_holidays" id="menu_open_ask_holidays_new" action="open_ask_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_holidays">
             <field name="name">Requests Approve</field>
@@ -349,7 +349,7 @@
             <field name="act_window_id" ref="open_allocation_holidays"/>
         </record>
 
-        <menuitem name="My Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
+        <menuitem name="Allocation Requests" parent="menu_open_ask_holidays" id="menu_open_allocation_holidays" action="open_allocation_holidays"/>
 
         <record model="ir.actions.act_window" id="request_approve_allocation">
             <field name="name">Allocation Requests to Approve</field>