[MERGE]:merged from trunk

bzr revid: apa@tinyerp.com-20120629124820-aec88wzcrvm6xps4

diff --cc addons/hr/hr_view.xml
Simple merge

diff --cc addons/hr_evaluation/hr_evaluation_view.xml
Simple merge

diff --cc addons/hr_expense/hr_expense_view.xml
Simple merge

diff --cc addons/hr_holidays/hr_holidays_view.xml
index aad81a3,32790cb..fdf9830
--- 1/addons/hr_holidays/hr_holidays_view.xml
--- 2/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@@ -60,31 -60,22 +60,31 @@@
              <field name="arch" type="xml">
                  <form version="7.0">
                  <header>
-                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow"/>
-                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
-                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
-                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
-                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
+                     <button string="Submit to Manager" name="confirm" states="draft" type="workflow" class="oe_highlight"/>
+                     <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                     <button string="Validate" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user" class="oe_highlight"/>
+                     <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager" class="oe_highlight"/>
+                     <button string="Reset to New" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user" />
                      <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                  </header>
 -                <sheet string="Leave Request" layout="auto">
 -                    <group col="8" colspan="4">
 -                    <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
 -                    <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
 -                    <group attrs="{'invisible':[('holiday_type','=','employee')]}">
 -                        <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
 +                <sheet string="Leave Request">
 +                    <group>
 +                        <group>
 +                            <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
 +                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
 +                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
 +                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                          </group>
 -                        <group attrs="{'invisible':[('holiday_type','=','category')]}">
 -                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}" groups="base.group_hr_user"/>
 +                        <group>
 +                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
 +                            <label for="number_of_days_temp" string="Duration"/>
 +                            <div>
 +                                <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/> - 
 +                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1" class="oe_inline"/>
 +                                <div>
 +                                    <field name="number_of_days_temp" class="oe_inline"/> days
 +                                </div>
 +                            </div>
                          </group>
                      </group>
                      <notebook colspan="4">

diff --cc addons/hr_payroll/hr_payroll_view.xml
Simple merge

diff --cc addons/hr_recruitment/hr_recruitment_view.xml
Simple merge

diff --cc addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
Simple merge