From b58e3b19b123d0e5fd4b4488ebf6d21efe705eed Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 17:04:28 +0530
Subject: [PATCH] [IMP]improve and clean hr_timesheet_sheet hr_holidays and
 hr_evaluation

bzr revid: sgo@tinyerp.com-20120621113428-gefe64xwyeh4dfwr
---
 addons/hr_evaluation/hr_evaluation_view.xml   | 31 ++++++++++---------
 addons/hr_holidays/hr_holidays_view.xml       | 25 +++++++--------
 .../hr_timesheet_sheet_view.xml               | 10 +++---
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 982ea1c4000..5769bbdce0b 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -132,7 +132,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Notes" position="before">
+                <page string="Miscellaneous" position="after">
                     <page string="Appraisal" groups="base.group_hr_user">
                         <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
                         <field name="evaluation_date"/>
@@ -157,14 +157,17 @@
                 </header>
                 <sheet>
                     <group>
-                        <group string="Appraisal Data">
-                            <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                            <field name="plan_id"/>
+                        <label for="employee_id" class="oe_edit_only"/>
+                         <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
+                         
+                        <label for="plan_id" class="oe_edit_only"/>
+                         <h1><field name="plan_id"/></h1>
+                         <group colspan="4" col="3">
                             <field name="date"/>
-                        </group>
-                        <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}" string="Ending Summary">
-                            <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
-                            <field name="date_close" readonly="1"/>
+                            <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
+                                <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
+                                <field name="date_close" readonly="1"/>
+                            </group>
                         </group>
                     </group>
                     <notebook>
@@ -178,11 +181,11 @@
                                             <button name="%(survey.survey_browse_response)d" string="Print Interview" type="action" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response','=',False)]}" />
                                         </div>
                                         <field name="date_deadline"/>
-                                        <field name="response" readonly="1"/>
                                         <field name="user_to_review_id"/>
+                                        <field name="response" readonly="1"/>
                                         <field name="user_id" string="Interviewer"/>
                                     </group>
-                                    <group col="4" string="Status">
+                                    <group col="4" string="Status" invisible="1">
                                          <field name="state"/>
                                          <div>
                                              <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
@@ -287,12 +290,12 @@
                     </header>
                     <sheet>
                         <group col="4">
-                             <field name="user_to_review_id"/>
-                             <field name="user_id" string="Interviewer"/>
-                             <field name="date_deadline"/>
                              <field name="survey_id"/>
-                             <field name="evaluation_id"/>
+                             <field name="date_deadline"/>
+                             <field name="user_to_review_id"/>
                              <field name="response" readonly="1"/>
+                             <field name="user_id" string="Interviewer"/>
+                             <field name="evaluation_id"/>
                         </group>
                     </sheet>
                 </form>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 66c0ec04280..25d471d622a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -75,25 +75,25 @@
                 <sheet string="Leave Request" layout="auto">
                     <group col="4" colspan="4">
                     <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                    <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')],'invisible':[('holiday_type','=','employee')]}"/>
+                    <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" width="130" string="Mode" groups="base.group_hr_user"/>
-                    <group>
+                    <label for="number_of_days_temp"/>
+                    <div>
                         <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/>
                         <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                        <field name="number_of_days_temp"/>
-                    </group>
+                        <field name="number_of_days_temp" string="Duration"/>
+                    </div>
+                    <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')],'invisible':[('holiday_type','=','employee')]}"/>
                     <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')],'invisible':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                             <field name="double_validation" invisible="1"/>
                             <newline/>
                             <field name="manager_id" groups="base.group_no_one"/>
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
-                            <separator string="Reasons" colspan="4"/>
-                            <field name="notes" nolabel="1" colspan="4"/>
+                            <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                         </page>
                     </notebook>
                 </sheet>
@@ -120,24 +120,23 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
-                <group>
+                <group colspan="4" col="4">
                     <field name="name"/>
+                    <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
                     <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
+                    <field name="number_of_days_temp"/>
                     <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
                     <field name="category_id" attrs="{'required':[('holiday_type','=','category')], 'readonly':[('state','!=','draft')], 'invisible':[('holiday_type','=','employee')]}"/>
+                    <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                 </group>
                 <notebook>
                     <page string="General">
                         <group col="4">
-                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
-                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
-                            <field name="number_of_days_temp"/>
                             <field name="double_validation" invisible="1"/>
                             <field name="manager_id"/>
                             <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
                         </group>
-                        <separator string="Reasons"/>
-                        <field name="notes"/>
+                        <field name="notes" placeholder="Add a reason..."/>
                     </page>
                 </notebook>
             </sheet>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index e2f60eb3c93..ba067b458c0 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -78,10 +78,13 @@
                         From <field name="date_from" />
                         to <field name="date_to"/>
                     </h2>
-                    <group col="4" class="oe_edit_only">
+                    <group col="4" colspan="4">
                         <field name="name"/>
+                        <field name="total_attendance" widget="float_time"/>
                         <field name="department_id"/>
+                        <field name="total_timesheet" widget="float_time"/>
                         <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="total_difference" widget="float_time"/>
                         <field name="user_id" invisible="1"/>
                     </group>
                     <notebook>
@@ -152,11 +155,6 @@
                                     <field name="total_difference" widget="float_time"/>
                                 </tree>
                             </field>
-                            <group colspan="4" col="6">
-                                <field name="total_attendance" widget="float_time" class="oe_edit_only"/>
-                                <field name="total_timesheet" widget="float_time" class="oe_edit_only"/>
-                                <field name="total_difference" widget="float_time" class="oe_edit_only"/>
-                            </group>
                         </page>
                     </notebook>
                 </sheet>