From e78a09065a3e4d3fff5a4af8b30d1cfe0b0d3ce2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 17:53:00 +0530
Subject: [PATCH] [IMP]:improved hr view with new style.

bzr revid: apa@tinyerp.com-20120622122300-c623awtkcjvzsqp6
---
 addons/hr/hr_view.xml                       | 106 ++++++++++----------
 addons/hr_attendance/hr_attendance_view.xml |   8 +-
 addons/hr_holidays/hr_holidays_view.xml     |   6 +-
 addons/hr_payroll/hr_payroll_view.xml       |  46 +++++----
 4 files changed, 85 insertions(+), 81 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 0edb22c0c82..01999885426 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -22,60 +22,64 @@
             <field name="arch" type="xml">
                 <form string="Employee" version="7.0">
                     <sheet>
-                    <div class="oe_right oe_button_box">
-                        <!-- Put here related buttons -->
-                    </div>
-                    <field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
-                    <label for="name" class="oe_edit_only"/>
-                       <h1><field name="name"/>,</h1>
-                    <label for="company_id" class="oe_edit_only"/>
-                        <h1><field name="company_id" class="oe_inline" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h1>
-                     <label for="job_id" class="oe_edit_only"/>
-                        <h1>at <field name="job_id" class="oe_inline" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/></h1>
-                    
-                    <label for="department_id" class="oe_edit_only"/>
-                    <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
-                    <h3><field name="category_ids" widget="many2many_tags"/></h3>
-                    <group colspan="4" col="4">
-                        <field name="work_email" widget="email" />
-                        <field name="work_phone"/>
-                        <field name="address_id" on_change="onchange_address_id(address_id)" />
-                        <field name="mobile_phone"/>
-                    </group>
-                    <notebook>
-                        <page string="Personal Information">
-                            <group>
-                                <group string="Linked User" colspan="4" col="4">
-                                    <field name="identification_id" groups="base.group_hr_user"/>
-                                    <field name="parent_id" />
-                                    <field name="passport_id" groups="base.group_hr_user"/>
-                                    <field name="coach_id"/>
-                                    <field name="otherid" groups="base.group_hr_user"/>
-                                    <field name="active"/>
-                                </group>
+                        <field name="photo" widget='image' class="oe_right" on_change="onchange_photo(photo)"/>    
+                        <div class="oe_right oe_button_box" name="button_box">
+                            <!-- Put here related buttons -->
+                        </div>
+                        <div class="oe_title">
+                            <label for="name" class="oe_edit_only"/>
+                            <h1>
+                                <field name="name" class="oe_inline"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
+                                <field class="oe_inline" name="job_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                                <label class="oe_inline" string="at" attrs="{'invisible': [('work_location', '=', False)]}"/>
+                                <field class="oe_inline" name="work_location" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                            </h1>
+                            <label for="department_id" class="oe_edit_only"/>
+                            <h2><field name="department_id" on_change="onchange_department_id(department_id)" class="oe_inline"/></h2>
+                            <h3><field name="category_ids" widget="many2many_tags" class="oe_inline"/></h3>
+                        </div>
+                        <group colspan="4" col="4">
+                            <field name="work_email" widget="email" />
+                            <field name="work_phone"/>
+                            <field name="address_id" on_change="onchange_address_id(address_id)" />
+                            <field name="mobile_phone"/>
+                        </group>
+                        <notebook>
+                            <page string="Information">
+                                <group col="4">
+                                    <group string="Linked User">
+                                        <field name="parent_id" />
+                                        <field name="coach_id"/>
+                                        
+                                    </group>
+                                    <group>
+                                        <field name="identification_id" groups="base.group_hr_user"/>
+                                        <field name="passport_id" groups="base.group_hr_user"/>
+                                        <field name="otherid" groups="base.group_hr_user"/>
+                                        <field name="active"/>
+                                    </group>
                                 <!-- <group string="General">
                                     <field name="user_id" on_change="onchange_user(user_id)"/>
                                 </group> -->
-                               <!--  <group groups="base.group_hr_user" string="Status">
-                                    <field name="birthday"/>
-                                </group> -->
-                                <!-- <group string="Contact Information">
-                                    <field name="work_location"/>
-                                </group> -->
-                            </group>
-                            <separator string="Notes"/>
-                            <field name="notes" placeholder="Other Information ..."/>
-                        </page>
-                        <page string="Miscellaneous" groups="base.group_hr_user">
-                            <group colspan="4" col="4">
-                                 <field name="country_id"/>
-                                 <field name="gender"/>
-                                 <field name="marital"/>
-                                 <field name="address_home_id"/>
-                                 <field name="birthday"/>
-                            </group>
-                        </page>
-                    </notebook>
+                                </group>
+                                <field name="notes" placeholder="Other Information ..." colspan="4"/>
+                            </page>
+                            <page string="Personal Information" groups="base.group_hr_user">
+                                <group col="4">
+                                    <group>
+                                        <field name="country_id"/>
+                                        <field name="bank_account_id"/>
+                                        <field name="address_home_id"/>
+                                    </group>
+                                    <group>
+                                        <field name="gender"/>
+                                        <field name="marital"/>
+                                        <field name="birthday"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 627d6057a88..c452fdb43e8 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -134,11 +134,9 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-                    <group colspan="2" col="5">
-                        <field name="state"/>
-                        <button name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
-                        <button name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
-                    </group>
+					<field name="state" class="oe_inline"/>
+					<button class="oe_inline" name="attendance_action_change" states="present" string="Sign Out" type="object" icon="gtk-go-forward" context="{'type':'sign_out'}" groups="base.group_hr_user"/>
+					<button class="oe_inline" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 89e0bf10339..6f28edf482e 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -477,9 +477,9 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <div class="oe_right oe_button_box" position="inside">
-                     <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
-                 </div>
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
+                </xpath>
                 <field name="active" position="before">
                     <field name="remaining_leaves"/>
                 </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index dcb5230cc4c..54a78ad68e7 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -410,28 +410,30 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-            <data>
-                <div class="oe_right oe_button_box" position="inside">
-                     <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
-                 </div>
-                  <xpath expr="//field[@name='identification_id']" position="before">
-                    <field name="manager" select="1"/>
-                 </xpath>
-                 <field name="otherid" position="after">
-                         <field name="vehicle" select="1"/>
-                         <field name="medic_exam" select="1" string="Medical Examination"/>
-                         <field name="vehicle_distance" select="1"/>
-                  </field>
-                <field name="address_home_id" position="after">
-                    <field name="children"/>
-                </field>
-                <field name="birthday" position="after">
-                    <field name="place_of_birth"/>
-                </field>
-                <field name="marital" position="before">
-                    <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                </field>
-            </data>
+                <data>
+                    <xpath expr="//div[@name='button_box']" position="inside">
+                        <button name="%(act_hr_employee_payslip_list)d" string="Payslips" type="action"/>
+                    </xpath>
+                    <xpath expr="//field[@name='parent_id']" position="before">
+                        <field name="manager"/>
+                    </xpath>
+                    <field name="coach_id" position="after">
+                        <field name="vehicle"/>
+                        <field name="vehicle_distance"/>
+                    </field>
+                    <field name="active" position="before">
+                        <field name="medic_exam" string="Medical Examination"/>
+                    </field>
+                    <field name="birthday" position="before">
+                        <field name="children"/>
+                    </field>
+                    <field name="birthday" position="after">
+                        <field name="place_of_birth"/>
+                    </field>
+                    <field name="bank_account_id" position="replace">
+                        <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
+                    </field>
+                </data>
             </field>
         </record>
         <!-- Salary Category-->