[IMP] HR Leaves useability

bzr revid: fp@tinyerp.com-20121126074101-emvux1ullg1txoly

diff --cc addons/hr/hr_view.xml
index 4464dce,fa17122..bcee15e
--- 1/addons/hr/hr_view.xml
--- 2/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@@ -6,10 -6,9 +6,9 @@@
          <menuitem name="Human Resources"
              id="menu_hr_root"
              groups="base.group_hr_manager,base.group_hr_user,base.group_user"
 -            sequence="110"/>
 +            sequence="90"/>
          <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"/>
  

diff --cc addons/hr_holidays/hr_holidays_view.xml
index 752d278,6f765c6..21744d2
--- 1/addons/hr_holidays/hr_holidays_view.xml
--- 2/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@@ -146,7 -146,11 +146,10 @@@
                          <group>
                              <field name="name" required="1" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
                              <field name="holiday_status_id" context="{'employee_id':employee_id}"/>
-                             <field name="number_of_days_temp"/>
+                             <label for="number_of_days_temp"/>
+                             <div>
 -                                <field name="number_of_days_temp" string="Allocation" class="oe_inline"/>
 -                                <span> days</span>
++                                <field name="number_of_days_temp" class="oe_inline"/> days
+                             </div>
                          </group>
                          <group>
                              <field name="holiday_type" on_change="onchange_type(holiday_type)"/>
@@@ -176,7 -180,7 +179,7 @@@
                      <field name="department_id" invisible="1"/>
                      <field name="holiday_status_id"/>
                      <field name="name"/>
-                     <field name="number_of_days" string="Number of Days" sum="Remaining Days"/>
 -                    <field name="number_of_days" string="Allocation" sum="Remaining Days"/>
++                    <field name="number_of_days" string="Allocated Days" sum="Remaining Days"/>
                      <field name="manager_id" invisible="1"/>
                      <field name="user_id" invisible="1"/>
                      <!--field name="type"/-->
@@@ -297,7 -301,7 +300,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"/>
++        <menuitem 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 -353,7 +352,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"/>
++        <menuitem 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>
@@@ -541,7 -545,8 +544,7 @@@
                      <group string="Leaves">
                          <label for="remaining_leaves"/>
                          <div>
--                            <field name="remaining_leaves" class="oe_inline"/>
 -                            <span> days</span>
++                            <field name="remaining_leaves" class="oe_inline"/> days
                          </div>
                      </group>
                  </xpath>