From 7ad658375fd805497e4d9e0ff318cb65a7c1abed Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 11:43:33 +0530
Subject: [PATCH 01/41] [IMP]clean form view and improve hr employee form view

bzr revid: sgo@tinyerp.com-20120621061333-zfjlr55m0oo83f24
---
 addons/hr/hr_view.xml                         | 76 +++++++++----------
 addons/hr_attendance/hr_attendance_view.xml   |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       |  5 +-
 addons/hr_payroll/hr_payroll_view.xml         | 46 +++++------
 addons/hr_timesheet/hr_timesheet_view.xml     |  2 +-
 .../hr_timesheet_sheet_view.xml               | 11 +++
 6 files changed, 79 insertions(+), 65 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index c5fd64e586c..f46262309e7 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -26,54 +26,52 @@
                         <!-- Put here related buttons -->
                     </div>
                     <field class="oe_right" name="photo" widget='image' on_change="onchange_photo(photo)"/>
-                    <div class="oe_title">
-                        <label for="name" class="oe_edit_only"/>
-                        <h1><field name="name"/></h1>
-
-                        <label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/>
-                        <h2><field name="company_id" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/></h2>
-
-                        <label for="department_id" class="oe_edit_only"/>
-                        <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
-                    </div>
+                    <label for="name" class="oe_edit_only"/>
+                       <h1><field name="name"/>,
+                        <field name="company_id" class="oe_inline" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>at
+                        <field name="job_id" class="oe_inline oe_edit_only" 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="General">
-                                    <field name="user_id" on_change="onchange_user(user_id)"/>
-                                    <field name="active"/>
+                                <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>
-                                <group groups="base.group_hr_user" string="Social IDs">
-                                    <field name="identification_id"/>
-                                    <field name="passport_id"/>
-                                    <field name="otherid"/>
-                                </group>
-                                <group groups="base.group_hr_user" string="Status">
-                                    <field name="gender"/>
-                                    <field name="marital"/>
-                                    <field name="country_id"/>
+                                <!-- <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="address_home_id"/>
-                                    <field name="address_id" on_change="onchange_address_id(address_id)" />
-                                    <field name="work_phone"/>
-                                    <field name="mobile_phone"/>
-                                    <field name="work_email" widget="email" />
+                                </group> -->
+                                <!-- <group string="Contact Information">
                                     <field name="work_location"/>
-                                </group>
-                                <group string="Job Information">
-                                    <field name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                                    <field name="coach_id" />
-                                </group>
+                                </group> -->
                             </group>
+                            <separator string="Notes"/>
+                            <field name="notes" placeholder="Other Information ..."/>
                         </page>
-                        <page string="Categories" groups="base.group_hr_user">
-                            <field name="category_ids" widget="many2many_tags"/>
-                        </page>
-                        <page string="Notes" groups="base.group_hr_user">
-                            <field name="notes"/>
+                        <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>
                     </sheet>
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 92e2a8bcbed..627d6057a88 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -133,8 +133,8 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="coach_id" position="after">
-                    <group colspan="2">
+                <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"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 4342fb145e5..cd43704d6e4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -491,7 +491,10 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="coach_id" position="after">
+                <div class="oe_right oe_button_box" position="inside">
+                     <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action"/>
+                 </div>
+                <field name="active" position="before">
                     <field name="remaining_leaves"/>
                 </field>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4770e82481e..4139a0a265f 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -14,24 +14,26 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//page[@string='Personal Information']" position="after">
-                    <page string="Miscellaneous" groups="base.group_hr_user">
-                        <group colspan="2" col="2">
-                            <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                            <field name="place_of_birth"/>
-                            <field name="children"/>
-                            <!-- <field name="basic" invisible="0"/> -->
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Job Info" colspan="2"/>
-                            <field name="manager" select="1"/>
-                            <field name="vehicle" select="1"/>
-                            <field name="vehicle_distance" select="1"/>
-                            <field name="medic_exam" select="1" string="Medical Examination"/>
-                        </group>
-                    </page>
-                </xpath>
+                <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>
             </field>
         </record>
@@ -45,9 +47,10 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='right_column']" position="before">
-                    <separator string="Payslip Info" colspan="2"/>
-                    <field name="struct_id" required="1"/>
+                <xpath expr="//group[@name='right_column']" position="inside">
+                    <group string="Payslip Info" colspan="2" col="2">
+                        <field name="struct_id" required="1"/>
+                    </group>
                 </xpath>
                  <xpath expr="//field[@name='working_hours']" position="after">
                     <field name="schedule_pay"/>
@@ -753,7 +756,6 @@
         <!--  Shortcuts -->
 
         <act_window name="Payslips"
-            domain="[('employee_id', '=', active_id)]"
             context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
             res_model="hr.payslip"
             src_model="hr.employee"
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 4c5c22d9894..ad7a5733d04 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -98,7 +98,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Categories" position="after">
+                <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
                         <field name="product_id" domain="[('type','=','service')]"/>
                         <field name="journal_id" widget="selection"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 3ed1b943ced..bfe98177734 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -366,6 +366,17 @@
                 </tree>
             </field>
         </record>
+        
+        <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
+            <field name="name">hr.timesheet.sheet.employee.extd_form</field>
+            <field name="model">hr.employee</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_2_hr_timesheet)d" string="Timesheets" type="action"/>
+                 </div>
+            </field>
+        </record>
 
   <!-- Timesheet Button on Employee Form -->
   <act_window

From 3f068c097be477c21fe17779de055830f7d905d1 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 12:26:08 +0530
Subject: [PATCH 02/41] [IMP]Payslip Info and Advantage should be in 2 columns

bzr revid: sgo@tinyerp.com-20120621065608-5mw14bj3iwec2z0o
---
 addons/hr_contract/hr_contract_view.xml |  8 ++-
 addons/hr_payroll/hr_payroll_view.xml   | 80 ++++++++++++-------------
 2 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 142cb6b7667..83cd1ee7b0b 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -87,15 +87,17 @@
                                     <field name="trial_date_start" />
                                     <field name="trial_date_end" />
                                 </group>
-                                <group name="right_column" string="Advantages">
-                                    <field name="advantages" nolabel="1" colspan="2"/>
+                                <group name="right_column" colspan="4" col="4">
+                                    <group string="Advantages" colspan="2" col="2">
+                                        <field name="advantages" nolabel="1" />
+                                    </group>
                                 </group>
                             </group>
                             <separator string="Notes"/>
                             <field name="notes"/>
                         </page>
                         <page string="Work Permit">
-                            <group string="Valid for">
+                            <group>
                                 <field name="visa_no"/>
                                 <field name="permit_no"/>
                                 <field name="visa_expire"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 4139a0a265f..51f25c03271 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -6,37 +6,8 @@
         <menuitem id="payroll_configure" parent="hr.menu_hr_configuration" name="Payroll" groups="base.group_hr_manager" sequence="45"/>
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
-
-        <!-- Employee View -->
-        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2</field>
-            <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>
-            </field>
-        </record>
+        
+        
         <!-- End Employee View -->
 
         <!-- Contract View -->
@@ -47,7 +18,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='right_column']" position="inside">
+                <xpath expr="//group[@string='Advantages']" position="before">
                     <group string="Payslip Info" colspan="2" col="2">
                         <field name="struct_id" required="1"/>
                     </group>
@@ -416,7 +387,44 @@
             <field name="search_view_id" ref="view_hr_payslip_filter"/>
         </record>
         <menuitem action="action_view_hr_payslip_form" id="menu_department_tree" parent="menu_hr_root_payroll"/>
+        <act_window name="Payslips"
+                    context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+                    res_model="hr.payslip"
+                    src_model="hr.employee"
+                    view_id ="view_hr_payslip_tree"
+                    id="act_hr_employee_payslip_list"
+                    groups="base.group_hr_manager"/>
 
+        <!-- Employee View -->
+        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
+            <field name="name">hr.hr.employee.view.form2</field>
+            <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>
+            </field>
+        </record>
         <!-- Salary Category-->
         <record id="hr_salary_rule_category_form" model="ir.ui.view">
             <field name="name">hr.salary.rule.category.form</field>
@@ -755,14 +763,6 @@
 
         <!--  Shortcuts -->
 
-        <act_window name="Payslips"
-            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-            res_model="hr.payslip"
-            src_model="hr.employee"
-            view_id ="view_hr_payslip_tree"
-            id="act_hr_employee_payslip_list"
-            groups="base.group_hr_manager"/>
-
         <act_window name="Payslip Computation Details"
         	domain="[('slip_id', '=', active_id)]"
         	context="{'default_slip_id': active_id}"

From 4f72ea02f9147c58d7dd521599d2306ba8aaa909 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 14:00:53 +0530
Subject: [PATCH 03/41] [IMP]change view in hr_timesheet and hr_payroll

bzr revid: sgo@tinyerp.com-20120621083053-ojvyk5t2qm4m42ey
---
 addons/hr_recruitment/hr_recruitment.py       |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 20 +++++++++----------
 .../hr_timesheet_sheet_view.xml               | 12 +++++------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index c893755c7c0..48649f8aa96 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -200,7 +200,7 @@ class hr_applicant(base_stage, osv.Model):
                       If the case needs to be reviewed then the state is \
                       set to \'Pending\'.'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'user_id': fields.many2one('res.users', 'Responsible'),
+        'user_id': fields.many2one('res.users', 'HR Manager'),
         # Applicant Columns
         'date_closed': fields.datetime('Closed', readonly=True, select=True),
         'date_open': fields.datetime('Opened', readonly=True, select=True),
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 63263d78c9d..24682f7be37 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -111,25 +111,29 @@
                 </div>
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name"/></h1>
+                    <h1><field name="name" string="Subject"/></h1>
                     <label for="partner_name" class="oe_edit_only"/>
-                    <h2><field name="partner_name"/></h2>
+                    <h2><field name="partner_name"/>
                     <field name="type_id" placeholder="Degree"/>
+                    apply for<field name="job_id" on_change="onchange_job(job_id)"/>
+                    </h2>
                 </div>
 
                 <group>
                     <group>
                         <field name="user_id"/>
-                        <field name="title_action"/>
-                        <field name="date_action"/>
+                        <label for="title_action"/>
+                        <div>
+                            <field name="date_action" nolabel="1"/> -
+                            <field name="title_action" class="oe_inline" nolabel="1" placeholder="Call for proposal"/>
+                        </div>
                     </group>
                     <group>
-                        <field name="job_id" on_change="onchange_job(job_id)"/>
                         <field name="priority" string="Appreciation"/>
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
                         <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-                        <field name="state" groups="base.group_no_one"/>
+                        <field name="state" nolabel="1" groups="base.group_no_one"/>
                     </group>
                 </group>
                 <notebook>
@@ -140,10 +144,6 @@
                                 <div>
                                     <field name="partner_id" class="oe_inline"
                                         on_change="onchange_partner_id(partner_id, email_from)"/>
-                                    <button class="oe_inline"
-                                        string="Create" help="Create a new contact for this applicant" icon="gtk-index"
-                                        name="%(action_hr_recruitment_partner_create)d" type="action"
-                                        attrs="{'invisible':[('partner_id','!=',False)]}"/>
                                 </div>
                                 <field name="email_from" widget="email"/>
                                 <field name="partner_phone"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index bfe98177734..1eb0bffd5d3 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -367,7 +367,12 @@
             </field>
         </record>
         
-        <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
+  <!-- Timesheet Button on Employee Form -->
+  <act_window
+           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
+           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
+           
+      <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
@@ -378,10 +383,5 @@
             </field>
         </record>
 
-  <!-- Timesheet Button on Employee Form -->
-  <act_window
-           context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
-           id="act_hr_employee_2_hr_timesheet" name="Timesheets" res_model="hr_timesheet_sheet.sheet" src_model="hr.employee"/>
-
     </data>
 </openerp>

From 1e7817740b65511e63baa6e991a5150003eef4f1 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 14:20:13 +0530
Subject: [PATCH 04/41] [IMP]improve and clean hr_timesheet_sheet

bzr revid: sgo@tinyerp.com-20120621085013-sz80dz60mq18f0jn
---
 .../hr_timesheet_sheet_view.xml                  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 1eb0bffd5d3..1486a346fc9 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -75,14 +75,14 @@
                     <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
                     <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
                     <h2>
-                        From <field name="date_from"/>
+                        From <field name="date_from" />
                         to <field name="date_to"/>
                     </h2>
                     <group col="4">
-                        <field name="name"/>
-                        <field name="department_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
-                        <field name="user_id" invisible="1"/>
+                        <field name="name" class="oe_edit_only"/>
+                        <field name="department_id" class="oe_edit_only"/>
+                        <field name="company_id" groups="base.group_multi_company" class="oe_edit_only"/>
+                        <field name="user_id" invisible="1" class="oe_edit_only"/>
                     </group>
                     <notebook>
                         <page string="Daily">
@@ -149,9 +149,9 @@
                                 </tree>
                             </field>
                             <group colspan="4" col="6">
-                                <field name="total_attendance" widget="float_time"/>
-                                <field name="total_timesheet" widget="float_time"/>
-                                <field name="total_difference" widget="float_time"/>
+                                <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>

From 5b6c2985f732a8bd06ec26b377046c4859d10088 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 14:36:02 +0530
Subject: [PATCH 05/41] [IMP]improve and clean hr_expense

bzr revid: sgo@tinyerp.com-20120621090602-m72nm166odf8h05k
---
 addons/hr_expense/hr_expense_view.xml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index e57f20734eb..7e3e928a1e1 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -86,22 +86,17 @@
                         <page string="Description">
                             <field name="line_ids" context="{'currency_id': currency_id}">
                                 <form string="Expense Lines" version="7.0">
-                                    <group col="6" colspan="4">
+                                    <group col="4" colspan="4">
                                         <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
-                                        <field name="name" colspan="4"/>
-                                        <newline/>
                                         <field name="unit_amount"/>
-                                        <field name="unit_quantity"/>
-                                        <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)"/>
-                                    </group>
-                                    <group colspan="2" col="2" groups="analytic.group_analytic_accounting">
-                                        <separator string="Customer Project" colspan="2"/>
-                                        <field domain="[('type','=','normal')]" name="analytic_account"/>
-                                    </group>
-                                    <group colspan="2" col="2">
-                                        <separator string="References" colspan="2"/>
-                                        <field name="date_value" />
+                                        <field name="name"/>
+                                        <group colspan="2" col="4">
+                                            <field name="unit_quantity"/>
+                                            <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_edit_only"/>
+                                        </group>
                                         <field name="ref"/>
+                                        <field name="date_value" />
+                                        <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                                     </group>
                                 </form>
                             </field>

From 33473284a3062c30f8bdf15e2ba1b565bdbfde4e Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 15:26:46 +0530
Subject: [PATCH 06/41] [IMP]improve and clean hr_timesheet_sheet

bzr revid: sgo@tinyerp.com-20120621095646-t6dv93hfv8x1jkww
---
 addons/hr_holidays/hr_holidays_view.xml       | 18 ++++-----
 .../hr_timesheet_sheet_view.xml               | 38 ++++++++++---------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index cd43704d6e4..66c0ec04280 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -73,23 +73,21 @@
                     <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">
+                    <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_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')]}"/>
-                        </group>
-                        <group attrs="{'invisible':[('holiday_type','=','category')]}">
-                        <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')]}" groups="base.group_hr_user"/>
-                        </group>
+                    <group>
+                        <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="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="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"/>
                             <field name="double_validation" invisible="1"/>
                             <newline/>
                             <field name="manager_id" groups="base.group_no_one"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 1486a346fc9..e2f60eb3c93 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -78,11 +78,11 @@
                         From <field name="date_from" />
                         to <field name="date_to"/>
                     </h2>
-                    <group col="4">
-                        <field name="name" class="oe_edit_only"/>
-                        <field name="department_id" class="oe_edit_only"/>
-                        <field name="company_id" groups="base.group_multi_company" class="oe_edit_only"/>
-                        <field name="user_id" invisible="1" class="oe_edit_only"/>
+                    <group col="4" class="oe_edit_only">
+                        <field name="name"/>
+                        <field name="department_id"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                        <field name="user_id" invisible="1"/>
                     </group>
                     <notebook>
                         <page string="Daily">
@@ -94,19 +94,23 @@
                                 <button name="date_today" string="Today" type="object" icon="terp-go-today"/>
                                 <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
                             </group>
-
-                            <field colspan="3" context="{'name':date_current,'user_id':user_id}" height="100" name="attendances_ids" nolabel="1">
-                                <tree string="Attendances" editable="bottom">
-                                    <field name="name"/>
-                                    <field name="action"/>
-                                    <field invisible="1" name="employee_id"/>
-                                </tree>
-                            </field>
-                            <group col="4" colspan="1">
+                            <group colspan="4" col="3">
+                                <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
+                                    <tree string="Attendances" editable="bottom">
+                                        <field name="name"/>
+                                        <field name="action"/>
+                                        <field invisible="1" name="employee_id"/>
+                                    </tree>
+                                </field>
+                                <group colspan="2" col="2">
+                                    <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
+                                    <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
+                                </group>
+                            </group>
+                            
+                            <group col="4">
                                 <field name="state_attendance"/>
-                                <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
-                                <field name="total_attendance_day" widget="float_time" colspan="4"/>
+                                <field name="total_attendance_day" widget="float_time"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">

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 07/41] [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>

From cf2b8e1737388dc7d787be59a992a570d7020a97 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Thu, 21 Jun 2012 18:55:01 +0530
Subject: [PATCH 08/41] [IMP]improve and clean hr_department hr_job,
 hr_payroll_status,hr,hr_holidays as per new form view guidelines

bzr revid: sgo@tinyerp.com-20120621132501-srjmo019uho1mgif
---
 addons/hr/hr_department_view.xml        |  2 +-
 addons/hr/hr_view.xml                   | 28 +++++++++---------
 addons/hr_holidays/hr_holidays_view.xml | 18 +++---------
 addons/hr_payroll/hr_payroll_view.xml   | 39 +++++++++++++++----------
 4 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index d6fd393edf8..4387a9f6dd8 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -15,8 +15,8 @@
                 <form string="department" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="parent_id"/>
                         <field name="manager_id"/>
+                        <field name="parent_id"/>
                         <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                     </group>
                 </form>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index f46262309e7..89ab6d2512c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -357,17 +357,20 @@
                         <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
                     </header>
                     <sheet>
-                        <group>
-                            <group>
-                                <field name="name" />
-                                <field name="department_id" />
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
-                            <group>
-                                <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
-                                <field name="no_of_employee"/>
-                                <field name="expected_employees"/>
-                            </group>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name" />
+                            (<field name="department_id"/>)
+                        </h1>
+                        <label for="employee_ids" class="oe_edit_only"/>
+                        <h2>
+                            <field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
+                        </h2>
+                        <group col="4">
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                            <field name="no_of_employee"/>
+                            <field name="expected_employees"/>
                         </group>
                         <notebook>
                             <page string="Description">
@@ -376,9 +379,6 @@
                                 <label for="requirements"/>
                                 <field name="requirements"/>
                             </page>
-                            <page string="Employees">
-                                <field name="employee_ids" widget="many2many" mode="tree,form"/>
-                            </page>
                         </notebook>
                     </sheet>
                 </form>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index c55b7cc7678..89e0bf10339 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -368,22 +368,12 @@
                 <form string="Leave Type" version="7.0">
                     <group col="4">
                         <field name="name"/>
-                        <field name="color_name"/>
+                        <field name="double_validation"/>
                         <field name="categ_id" widget="selection"/>
+                        <field name="limit"/>
+                        <field name="color_name"/>
+                        <field name="active"/>
                     </group>
-                    <notebook>
-                      <page string="Details">
-                          <group>
-                              <group name="selection" string="Validation">
-                                  <field name="double_validation"/>
-                                  <field name="limit"/>
-                              </group>
-                              <group name="second" string="Misc">
-                                  <field name="active"/>
-                              </group>
-                          </group>
-                      </page>
-                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 51f25c03271..dcb5230cc4c 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -80,7 +80,7 @@
             <field name="model">hr.payroll.structure</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Employee Function">
+                <form string="Employee Function" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="code"/>
@@ -224,6 +224,12 @@
                 </tree>
             </field>
         </record>
+        
+        <act_window name="Payslip Computation Details"
+            context="{'default_slip_id': active_id,'search_default_slip_id': active_id}"
+            res_model="hr.payslip.line"
+            src_model="hr.payslip"
+            id="act_payslip_lines"/>
 
         <record id="view_hr_payslip_form" model="ir.ui.view">
             <field name="name">hr.payslip.form</field>
@@ -240,6 +246,9 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm"/>
                 </header>
                 <sheet>
+                    <div class="oe_right oe_button_box">
+                        <button name="%(act_payslip_lines)d" string="Payslip Computation Details" type="action"/>
+                    </div>
                     <label for="employee_id" class="oe_edit_only"/>
                     <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
                     <label for="date_from" class="oe_edit_only" string="Period"/>
@@ -335,13 +344,13 @@
                             </field>
                        </page>
                        <page string="Other Information">
-                            <group col="2" string="Other Information">
+                            <group col="2">
                                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                 <field name="payslip_run_id" domain="[('state','=','draft')]"/>
                                 <field name="paid" readonly="1"/>
-                            </group>
-                            <group string="Notes">
-                            <field name="note"/>
+                                <div>
+                                    <field name="note" Placeholder="Add an internal note..."/>
+                                </div>
                             </group>
                        </page>
                     </notebook>
@@ -740,11 +749,18 @@
                     <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
-                    <group col="4">
+                    <label for="name" class="oe_edit_only"/>
+                    <h1>
                         <field name="name"/>
-                        <field name="credit_note"/>
-                        <field name="date_start"/>
+                    </h1>
+                    <h2>
+                        Period from 
+                        <field name="date_start"/> 
+                        to 
                         <field name="date_end"/>
+                    </h2>
+                    <group col="4">
+                        <field name="credit_note"/>
                     </group>
                     <field name="slip_ids"/>
                 </sheet>
@@ -763,13 +779,6 @@
 
         <!--  Shortcuts -->
 
-        <act_window name="Payslip Computation Details"
-        	domain="[('slip_id', '=', active_id)]"
-        	context="{'default_slip_id': active_id}"
-        	res_model="hr.payslip.line"
-        	src_model="hr.payslip"
-        	id="act_payslip_lines"/>
-
         <act_window name="Payslip Lines"
         	domain="[('register_id', '=', active_id)]"
         	context="{'default_register_id': active_id, 'search_default_register_id': 1}"

From 43752878d24799c785dbbe77693ebe09c760ad4f Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 22 Jun 2012 10:46:45 +0530
Subject: [PATCH 09/41] [IMP]view improvement in hr and timesheet

bzr revid: sgo@tinyerp.com-20120622051645-b0cldnh13z550sd3
---
 addons/hr/hr_view.xml                                 | 10 ++++++----
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 89ab6d2512c..0edb22c0c82 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,10 +27,12 @@
                     </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"/>,
-                        <field name="company_id" class="oe_inline" widget="selection" on_change="onchange_company(company_id)" groups="base.group_multi_company"/>at
-                        <field name="job_id" class="oe_inline oe_edit_only" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
-                    </h1>
+                       <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>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 3978b61b686..75edeb6c6f6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -93,7 +93,7 @@
                                         <field invisible="1" name="employee_id"/>
                                     </tree>
                                 </field>
-                                <group colspan="2" col="2">
+                                <group class="oe_right">
                                     <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
                                     <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
                                 </group>

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 10/41] [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-->

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

bzr revid: apa@tinyerp.com-20120622124758-epddnzizjmkk3dgz
---
 addons/hr/hr_view.xml                                 | 4 ++--
 addons/hr_timesheet/hr_timesheet_view.xml             | 6 ++++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 01999885426..4aae6c42a18 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -36,8 +36,8 @@
                                 <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>
+                            <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
+                            <h3><field name="category_ids" widget="many2many_tags"/></h3>
                         </div>
                         <group colspan="4" col="4">
                             <field name="work_email" widget="email" />
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index ad7a5733d04..31917bee75a 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -100,8 +100,10 @@
             <field name="arch" type="xml">
                 <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
-                        <field name="product_id" domain="[('type','=','service')]"/>
-                        <field name="journal_id" widget="selection"/>
+                        <group col="4">
+                            <field name="product_id" domain="[('type','=','service')]"/>
+                            <field name="journal_id"/>
+                        </group>
                     </page>
                 </page>
             </field>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 75edeb6c6f6..997616740b2 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -356,9 +356,9 @@
             <field name="model">hr.employee</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_2_hr_timesheet)d" string="Timesheets" type="action"/>
-                 </div>
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
+                </xpath>
             </field>
         </record>
 

From 77d6dcbdd86f30fb28af2282e170de0cfcf61fd2 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 18:32:11 +0530
Subject: [PATCH 12/41] [IMP]:improved view

bzr revid: apa@tinyerp.com-20120622130211-6iwa12n7sx303n6m
---
 addons/hr/hr_view.xml                       | 9 +++++----
 addons/hr_evaluation/hr_evaluation_view.xml | 8 +++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 4aae6c42a18..caf5a354f0c 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,13 +30,14 @@
                             <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'}"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}"/>
+                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
+                                <label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/>
+                                <field class="oe_inline" name="job_id" 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>
+                            <label for="category_ids" class="oe_edit_only"/>
                             <h3><field name="category_ids" widget="many2many_tags"/></h3>
                         </div>
                         <group colspan="4" col="4">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 5769bbdce0b..51709935fd8 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -132,10 +132,12 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Miscellaneous" position="after">
+                <page string="Personal Information" 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"/>
+                        <group col="4">
+                            <field name="evaluation_plan_id" on_change="onchange_evaluation_plan_id(evaluation_plan_id, evaluation_date)"/>
+                            <field name="evaluation_date"/>
+                        </group>
                     </page>
                 </page>
             </field>

From 8c3da42b7746d7d2e12efa2dee4fc1ce8ea01761 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 18:34:56 +0530
Subject: [PATCH 13/41] [IMP]:hr_attendance:removed tabs

bzr revid: apa@tinyerp.com-20120622130456-iuhexz3m6hiwt2jh
---
 addons/hr_attendance/hr_attendance_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index c452fdb43e8..d269407e072 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Employee attendances" version="7.0">
-                	<sheet>
+                    <sheet>
                     <group>
                         <field name="employee_id"/>
                         <field name="name"/>
@@ -134,9 +134,9 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-					<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 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>

From b6b97caa6b3283a10119acbd786b884b444ed32d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 18:57:35 +0530
Subject: [PATCH 14/41] [IMP]:hr_contract:improved view

bzr revid: apa@tinyerp.com-20120622132735-hds4xywi4rckbuq8
---
 addons/hr_contract/hr_contract_view.xml | 12 ++++++------
 addons/hr_payroll/hr_payroll_view.xml   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 83cd1ee7b0b..ce50d7f4cf1 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -87,17 +87,17 @@
                                     <field name="trial_date_start" />
                                     <field name="trial_date_end" />
                                 </group>
-                                <group name="right_column" colspan="4" col="4">
-                                    <group string="Advantages" colspan="2" col="2">
-                                        <field name="advantages" nolabel="1" />
-                                    </group>
-                                </group>
                             </group>
+							<group col="4">
+								<group col="1" name="advantages" colspan="2">
+									<field name="advantages"/>
+								</group>
+							</group>
                             <separator string="Notes"/>
                             <field name="notes"/>
                         </page>
                         <page string="Work Permit">
-                            <group>
+                            <group col="4">
                                 <field name="visa_no"/>
                                 <field name="permit_no"/>
                                 <field name="visa_expire"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 54a78ad68e7..4b25e9899d9 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -18,8 +18,8 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@string='Advantages']" position="before">
-                    <group string="Payslip Info" colspan="2" col="2">
+                <xpath expr="//group[@name='advantages']" position="before">
+                    <group col="3" colspan="2">
                         <field name="struct_id" required="1"/>
                     </group>
                 </xpath>

From b5fa697d8ce105c6e6055fcd080f5ca646765238 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 22 Jun 2012 19:04:30 +0530
Subject: [PATCH 15/41] [IMP]:hr:add notes seprator

bzr revid: apa@tinyerp.com-20120622133430-um46d6vq54hbdpt3
---
 addons/hr/hr_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index caf5a354f0c..fab7d4085a6 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -52,7 +52,6 @@
                                     <group string="Linked User">
                                         <field name="parent_id" />
                                         <field name="coach_id"/>
-                                        
                                     </group>
                                     <group>
                                         <field name="identification_id" groups="base.group_hr_user"/>
@@ -64,6 +63,7 @@
                                     <field name="user_id" on_change="onchange_user(user_id)"/>
                                 </group> -->
                                 </group>
+                                <separator string="Notes"/>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
                             <page string="Personal Information" groups="base.group_hr_user">

From 0b367184b563b016cd0385f147a80a7e74358baa Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 11:25:31 +0530
Subject: [PATCH 16/41] [IMP]:hr_contract:improved view

bzr revid: apa@tinyerp.com-20120625055531-y9w9vwztzrgrl99l
---
 addons/hr_contract/hr_contract_view.xml | 40 ++++++++++++-------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 5622d3dac17..52ad8c568c7 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -8,30 +8,30 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <page string="Personal Information" position="after">
-                    <page string="Miscellaneous" groups="base.group_hr_user">
-                        <group colspan="2" col="2">
-                        <separator string="Personal Info" colspan="2"/>
-                        <field name="bank_account_id"/>
-                        <field name="place_of_birth"/>
+				<data>
+                    <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"/>
-                        </group>
-                        <group colspan="2" col="2">
-                        <separator string="Job Info" colspan="2"/>
-                        <field name="manager" />
-                        <field name="vehicle" />
-                        <field name="vehicle_distance" />
-                        </group>
-                        <group colspan="2" col="2">
-                        <separator string="Others Info" colspan="2"/>
-                        <field name="medic_exam" />
-                        </group>
-                    </page>
-                </page>
+                    </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>
 
-
         <record id="hr_contract_view_search" model="ir.ui.view">
             <field name="name">hr.contract.view.search</field>
             <field name="model">hr.contract</field>

From 87e079367a4f806d53d26be362176ddd9037610d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 11:59:22 +0530
Subject: [PATCH 17/41] [IMP]:hr,hr_contract:improved view

bzr revid: apa@tinyerp.com-20120625062922-lvv1arp9yr7z801y
---
 addons/hr/hr_view.xml                   | 2 +-
 addons/hr_contract/hr_contract_view.xml | 6 +++---
 addons/hr_payroll/hr_payroll_view.xml   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 975681a9a66..6f514e8803b 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,7 +30,7 @@
                             <label for="name" class="oe_edit_only"/>
                             <h1>
                                 <field name="name" class="oe_inline"/>
-                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
                                 <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
                                 <label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/>
                                 <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 52ad8c568c7..bb74e35ddb4 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -87,9 +87,9 @@
                                     <field name="trial_date_end" />
                                 </group>
                             </group>
-							<group col="4">
-								<group col="1" name="advantages" colspan="2">
-									<field name="advantages"/>
+							<group>
+								<group name="right_column" string="Advantages">
+									<field name="advantages" nolabel="1"/>
 								</group>
 							</group>
                             <separator string="Notes"/>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index e4e552cc0d9..1335bab0a70 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -18,8 +18,8 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='advantages']" position="before">
-                    <group col="3" colspan="2">
+                <xpath expr="//group[@name='right_column']" position="before">
+                    <group string="Payslip Info">
                         <field name="struct_id" required="1"/>
                     </group>
                 </xpath>

From 24eff02343c988f37bc47f05ad6909ff122ea78d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 12:08:48 +0530
Subject: [PATCH 18/41] [IMP]:clean code for contract view.

bzr revid: apa@tinyerp.com-20120625063848-rnlta80rr7ptfaay
---
 .../l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index 46caa9f6478..5482b9a8a2b 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -9,7 +9,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                 <xpath expr="//page[@name='information']/group/group[@name='right_column']" position="before">
+                 <xpath expr="//field[@name='struct_id']" position="after">
                     <field name="travel_reimbursement_amount"/>
                     <field name="car_company_amount"/>
                     <field name="misc_onss_deduction"/>
@@ -20,12 +20,10 @@
                     <field name="retained_net_amount"/>
                  </xpath>
                  <xpath expr="//field[@name='trial_date_end']" position="after">
-                    <group colspan="2" col="2">
-                        <separator string="by Worker" colspan="2"/>
-                        <field name="insurance_employee_deduction"/>
-                        <field name="meal_voucher_employee_deduction"/>
-                        <field name="car_employee_deduction"/>
-                    </group>
+                    <separator string="By Worker" colspan="2"/>
+                    <field name="insurance_employee_deduction"/>
+                    <field name="meal_voucher_employee_deduction"/>
+                    <field name="car_employee_deduction"/>
                  </xpath>
             </data>
             </field>

From ff28ffd8803b94e2d8c1abd604112cc6798fd580 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 12:47:05 +0530
Subject: [PATCH 19/41] [IMP]:hr_recruitment:improved view as new style.

bzr revid: apa@tinyerp.com-20120625071705-nww473l8i18ezqmm
---
 addons/hr_recruitment/hr_recruitment.py       |  2 +-
 addons/hr_recruitment/hr_recruitment_view.xml | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 48649f8aa96..ec2de4a9918 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -181,7 +181,7 @@ class hr_applicant(base_stage, osv.Model):
         return res
 
     _columns = {
-        'name': fields.char('Name', size=128, required=True),
+        'name': fields.char('Subject', size=128, required=True),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the case without removing it."),
         'description': fields.text('Description'),
         'email_from': fields.char('Email', size=128, help="These people will receive email."),
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 281e7a74107..ed57698258e 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -109,31 +109,35 @@
                         string="Print Interview" icon="gtk-print" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                 </div>
+                
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
-                    <h1><field name="name" string="Subject"/></h1>
+                    <h1><field name="name"/></h1>
                     <label for="partner_name" class="oe_edit_only"/>
-                    <h2><field name="partner_name"/>
-                    <field name="type_id" placeholder="Degree"/>
-                    apply for<field name="job_id" on_change="onchange_job(job_id)"/>
+                    <h2>
+                        <field name="partner_name" class="oe_inline"/>
+                        <label class="oe_inline" string="(" attrs="{'invisible': [('type_id', '=', False)]}"/>
+                        <field name="type_id" placeholder="Degree" class="oe_inline"/>
+                        <label class="oe_inline" string=")" attrs="{'invisible': [('type_id', '=', False)]}"/>
+                        <label class="oe_inline" string="apply for " attrs="{'invisible': [('job_id', '=', False)]}"/>
+                        <field name="job_id" on_change="onchange_job(job_id)" class="oe_inline"/>
                     </h2>
                 </div>
-
                 <group>
                     <group>
                         <field name="user_id"/>
                         <label for="title_action"/>
                         <div>
-                            <field name="date_action" nolabel="1"/> -
-                            <field name="title_action" class="oe_inline" nolabel="1" placeholder="Call for proposal"/>
+                            <field name="date_action"/> -
+                            <field name="title_action" class="oe_inline" placeholder="Call for proposal"/>
                         </div>
                     </group>
                     <group>
                         <field name="priority" string="Appreciation"/>
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
-                        <field name="department_id" widget="selection" on_change="onchange_department_id(department_id)"/>
-                        <field name="state" nolabel="1" groups="base.group_no_one"/>
+                        <field name="department_id" on_change="onchange_department_id(department_id)"/>
+                        <div><field name="state" groups="base.group_no_one"/></div>
                     </group>
                 </group>
                 <notebook>

From 588246ea1b28480976582664254785a557e1a971 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 14:13:52 +0530
Subject: [PATCH 20/41] [IMP]:hr_timesheet_sheet:improved view

bzr revid: apa@tinyerp.com-20120625084352-2elq2jy3r04zenki
---
 .../hr_timesheet_sheet_view.xml               | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index a0ba6e88dda..5df49e7a6fe 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -62,28 +62,32 @@
                     <label for="employee_id" class="oe_edit_only"/>
                     <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
                     <label for="date_from" class="oe_edit_only" string="Timesheet Period"/>
-                    <h2>
-                        From <field name="date_from" />
-                        to <field name="date_to"/>
-                    </h2>
-                    <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"/>
+                    <h2>From <field name="date_from"/> to <field name="date_to"/></h2>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="department_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="total_attendance" widget="float_time"/>
+                            <field name="total_timesheet" widget="float_time"/>
+                            <field name="total_difference" widget="float_time"/>
+                            <field name="user_id" invisible="1"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Daily">
-                            <group col="6" colspan="4">
-                                <button name="button_dummy" string="Go to:" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                <field name="date_current" nolabel="1"/>
-                                <label string=""/>
-                                <button icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
-                                <button name="date_today" string="Today" type="object" icon="terp-go-today"/>
-                                <button icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
+                            <group>
+                                <div>
+                                    <button name="button_dummy" class="oe_inline" string="Go to" type="object" icon="terp-gtk-jump-to-ltr"/> :
+                                    <field name="date_current" class="oe_inline"/>
+                                </div>
+                                <div align="right">
+                                    <button class="oe_inline" icon="terp-gtk-go-back-ltr" name="date_previous" string="" type="object"/>
+                                    <button class="oe_inline" name="date_today" string="Today" type="object" icon="terp-go-today"/>
+                                    <button class="oe_inline" icon="terp-gtk-go-back-rtl" name="date_next" string="" type="object"/>
+                                </div>
                             </group>
                             <group colspan="4" col="3">
                                 <field context="{'name':date_current,'user_id':user_id}" name="attendances_ids" nolabel="1">
@@ -93,12 +97,13 @@
                                         <field invisible="1" name="employee_id"/>
                                     </tree>
                                 </field>
-                                <group class="oe_right">
-                                    <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
-                                    <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
+                                <group>
+                                    <div align="right">
+                                        <button name="sign_in" string="Sign In" type="object" icon="terp-gtk-jump-to-ltr"/>
+                                        <button name="sign_out" string="Sign Out" type="object" icon="terp-gtk-jump-to-rtl"/>
+                                    </div>
                                 </group>
                             </group>
-                            
                             <group col="4">
                                 <field name="state_attendance"/>
                                 <field name="total_attendance_day" widget="float_time"/>

From 9175b5008e187ea2cd22c28aac43715103e1238d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 14:25:27 +0530
Subject: [PATCH 21/41] [IMP]:hr_expense:improved expense line view

bzr revid: apa@tinyerp.com-20120625085527-g33k4hwd94gs1dy9
---
 addons/hr_expense/hr_expense_view.xml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 1e8e5ebdf3b..e560540e433 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -87,17 +87,22 @@
                         <page string="Description">
                             <field name="line_ids" context="{'currency_id': currency_id}">
                                 <form string="Expense Lines" version="7.0">
-                                    <group col="4" colspan="4">
-                                        <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
-                                        <field name="unit_amount"/>
-                                        <field name="name"/>
-                                        <group colspan="2" col="4">
-                                            <field name="unit_quantity"/>
-                                            <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_edit_only"/>
+                                    <group>
+                                        <group>
+                                            <field name="product_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" context="{'default_hr_expense_ok':1}"/>
+                                            <field name="name"/>
+                                            <field name="ref"/>
+                                            <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
+                                        </group>
+                                        <group>
+                                            <field name="unit_amount"/>
+                                            <label for="unit_quantity"/>
+                                            <div>
+                                                <field name="unit_quantity" class="oe_inline"/> 
+                                                <field name="uom_id" on_change="onchange_product_id(product_id, uom_id, parent.employee_id, context)" class="oe_inline"/>
+                                            </div>
+                                            <field name="date_value" />
                                         </group>
-                                        <field name="ref"/>
-                                        <field name="date_value" />
-                                        <field domain="[('type','=','normal')]" name="analytic_account" groups="analytic.group_analytic_accounting"/>
                                     </group>
                                 </form>
                             </field>

From afc972bd45be693bbcc1d43ec7bbed9f79c8cc95 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 14:56:43 +0530
Subject: [PATCH 22/41] [IMP]:hr_holidays:improved view

bzr revid: apa@tinyerp.com-20120625092643-q04fwfo16n3qrbu5
---
 addons/hr_holidays/hr_holidays_view.xml | 81 +++++++++++++------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 32bc38fc699..7d559c5704d 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -67,19 +67,22 @@
                     <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="4" colspan="4">
-                    <field name="name" attrs="{'readonly':[('state','!=','draft'),('state','!=','confirm')]}"/>
-                    <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"/>
-                    <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" 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"/>
+                <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"/>
+                        </group>
+                        <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"/>
+                            <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" string="Duration"/> days
+                            </div>
+                        </group>
                     </group>
                     <notebook colspan="4">
                         <page string="General">
@@ -92,9 +95,6 @@
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_sheet_width">
-                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-                </div>
                 </form>
             </field>
         </record>
@@ -115,30 +115,33 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                 </header>
                 <sheet>
-                <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="double_validation" invisible="1"/>
-                            <field name="manager_id"/>
-                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
+                            <field name="employee_id" attrs="{'required':[('holiday_type','=','employee')], 'invisible':[('holiday_type','=','category')]}"/>
+                            <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/>
                         </group>
-                        <field name="notes" placeholder="Add a reason..."/>
-                    </page>
-                </notebook>
-            </sheet>
-            <div class="oe_sheet_width">
-                <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
-            </div>
-            </form>
+                        <group>
+                            <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
+                            <field name="number_of_days_temp"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="General">
+                            <group col="4">
+                                <field name="double_validation" invisible="1"/>
+                                <field name="manager_id"/>
+                                <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}"/>
+                            </group>
+                            <field name="notes" placeholder="Add a reason..."/>
+                        </page>
+                    </notebook>
+                </sheet>
+                <div class="oe_sheet_width">
+                    <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
+                </form>
             </field>
         </record>
 

From 6ebcfe8ac1ee86db5510d0db791f6514d7b694a1 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 15:18:05 +0530
Subject: [PATCH 23/41] [IMP]:hr_evaluation

bzr revid: apa@tinyerp.com-20120625094805-7t1tibrzh370m4jy
---
 addons/hr_evaluation/hr_evaluation_view.xml | 74 ++++++++++++---------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 71e2d717dec..29abd73c7dc 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -159,41 +159,45 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
                 </header>
                 <sheet>
+                    <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"/>
+                    <h2><field name="plan_id"/></h2>
                     <group>
-                        <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">
+                        <group>
                             <field name="date"/>
-                            <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 attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
+                            <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
+                            <field name="date_close" readonly="1"/>
                         </group>
                     </group>
                     <notebook>
                         <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
                             <field name="survey_request_ids">
                                 <form string="Interview Appraisal" version="7.0">
-                                    <group col="4">
-                                        <field name="survey_id"/>
-                                        <div colspan="2">
-                                            <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                                            <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="user_to_review_id"/>
-                                        <field name="response" readonly="1"/>
-                                        <field name="user_id" string="Interviewer"/>
-                                    </group>
-                                    <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" />
-                                         </div>
+                                    <div class="oe_right oe_button_box">
+                                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                        <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>
+                                    <group>
+                                        <group>
+                                            <field name="survey_id"/>
+                                            <field name="user_to_review_id"/>
+                                            <field name="user_id" string="Interviewer"/>
+                                        </group>
+                                        <group>
+                                            
+                                            <field name="date_deadline"/>
+                                            <field name="response" readonly="1"/>
+                                        </group>
                                     </group>
+                                    <!--<group col="4" string="Status">-->
+                                    <!--     <field name="state"/>-->
+                                    <!--     <div>-->
+                                    <!--         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />-->
+                                    <!--     </div>-->
+                                    <!--</group>-->
                                 </form>
                             </field>
                         </page>
@@ -285,13 +289,17 @@
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
                     </header>
                     <sheet>
-                        <group col="4">
-                             <field name="survey_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>
+                            <group>
+                                <field name="survey_id"/>
+                                <field name="user_to_review_id"/>
+                                <field name="user_id" string="Interviewer"/>
+                            </group>
+                            <group>
+                                <field name="date_deadline"/>
+                                <field name="response" readonly="1"/>
+                                <field name="evaluation_id" string="Appraisal Plan"/>
+                            </group>
                         </group>
                     </sheet>
                 </form>

From 23de44d8ffe46479b139cf45baeeab67b1723fed Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 15:35:30 +0530
Subject: [PATCH 24/41] [IMP]:improved views

bzr revid: apa@tinyerp.com-20120625100530-b1ba3l7g3i7pnaav
---
 addons/hr/hr_department_view.xml        | 14 ++++++++------
 addons/hr/hr_view.xml                   |  4 ++--
 addons/hr_holidays/hr_holidays_view.xml | 22 ++++++++++++++--------
 addons/hr_payroll/hr_payroll_view.xml   | 16 +++++++++-------
 4 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 8e28ca4cc2c..bbf66f0d4c3 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -13,12 +13,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="department" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="manager_id"/>
-                        <field name="parent_id"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    </group>
+                    <sheet>
+                        <group col="4">
+                            <field name="name"/>
+                            <field name="manager_id"/>
+                            <field name="parent_id"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6f514e8803b..5b2e5adf5db 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -366,8 +366,8 @@
                     <sheet>
                         <label for="name" class="oe_edit_only"/>
                         <h1>
-                            <field name="name" />
-                            (<field name="department_id"/>)
+                            <field name="name" class="oe_inline"/>
+                            (<field name="department_id" class="oe_inline"/>)
                         </h1>
                         <label for="employee_ids" class="oe_edit_only"/>
                         <h2>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 7d559c5704d..d2847715000 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -365,14 +365,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type" version="7.0">
-                    <group col="4">
-                        <field name="name"/>
-                        <field name="double_validation"/>
-                        <field name="categ_id" widget="selection"/>
-                        <field name="limit"/>
-                        <field name="color_name"/>
-                        <field name="active"/>
-                    </group>
+                    <sheet>
+                        <group>
+                            <group>
+                                <field name="name"/>
+                                <field name="categ_id"/>
+                                <field name="color_name"/>
+                                <field name="active"/>
+                            </group>
+                            <group>
+                                <field name="double_validation"/>
+                                <field name="limit"/>
+                            </group>
+                        </group>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 1335bab0a70..422b3722c11 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -248,13 +248,15 @@
                     <div class="oe_right oe_button_box">
                         <button name="%(act_payslip_lines)d" string="Payslip Computation Details" type="action"/>
                     </div>
-                    <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
-                    <label for="date_from" class="oe_edit_only" string="Period"/>
-                    <h2>
-                        from <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
-                        to <field name="date_to"/>
-                    </h2>
+                    <div class="oe_title">
+                        <label for="employee_id" class="oe_edit_only"/>
+                        <h1><field name="employee_id" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/></h1>
+                        <label for="date_from" class="oe_edit_only" string="Period"/>
+                        <h2>
+                            From <field name="date_from" on_change="onchange_employee_id(date_from, date_to, employee_id, contract_id)"/>
+                            to <field name="date_to"/>
+                        </h2>
+                    </div>
                     <group col="4">
                         <field name="contract_id" domain="[('employee_id','=',employee_id)]" on_change="onchange_contract_id(date_from, date_to, employee_id, contract_id)"/>
                         <field name="number"/>

From 7083c77885142f2f4cf339b6c192f86f095a7972 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Mon, 25 Jun 2012 15:42:04 +0530
Subject: [PATCH 25/41] [IMP]:minor view changes

bzr revid: apa@tinyerp.com-20120625101204-yqxr2q0fupdhvkd0
---
 addons/hr/hr_view.xml                       | 1 -
 addons/hr_attendance/hr_attendance_view.xml | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5b2e5adf5db..13f16960961 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -63,7 +63,6 @@
                                     <field name="user_id" on_change="onchange_user(user_id)"/>
                                 </group> -->
                                 </group>
-                                <separator string="Notes"/>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
                             <page string="Personal Information" groups="base.group_hr_user">
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 9c50a1ab1de..306caa76a22 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -134,9 +134,12 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-                    <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"/>
+					<label for="state"/>
+					<div>
+						<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"/>
+					</div>
                 </field>
             </field>
         </record>

From 3de5e7c8c5ff1b6fbcaaed406f523180a18baecf Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 10:51:21 +0530
Subject: [PATCH 26/41] [IMP]:improved hr and hr holidays view

bzr revid: apa@tinyerp.com-20120626052121-0bl4wt48xw25falt
---
 addons/hr/hr_view.xml                   | 6 +++---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 13f16960961..d26776af5e3 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -30,10 +30,10 @@
                             <label for="name" class="oe_edit_only"/>
                             <h1>
                                 <field name="name" class="oe_inline"/>
-                                <label class="oe_inline" string="," attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
-                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
-                                <label class="oe_inline" string="at" attrs="{'invisible': [('job_id', '=', False)]}"/>
+                                <label class="oe_inline" string="," attrs="{'invisible': [('job_id', '=', False)]}"/>
                                 <field class="oe_inline" name="job_id" domain="[('state','!=','old')]" context="{'form_view_ref': 'hr.view_hr_job_employee_form'}"/>
+                                <label class="oe_inline" string="at" attrs="{'invisible': [('company_id', '=', False)]}" groups="base.group_multi_company"/>
+                                <field class="oe_inline" name="company_id" groups="base.group_multi_company" on_change="onchange_company(company_id)"/>
                             </h1>
                             <label for="department_id" class="oe_edit_only"/>
                             <h2><field name="department_id" on_change="onchange_department_id(department_id)"/></h2>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index d2847715000..2de9f718186 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -76,11 +76,11 @@
                         </group>
                         <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"/>
+                            <label for="number_of_days_temp" string="Duration"/>
                             <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" string="Duration"/> days
+                                <field name="number_of_days_temp"/> days
                             </div>
                         </group>
                     </group>

From c2e22e9b1ca185e6a61e1f936aa7bb374bd1c7dd Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 15:39:45 +0530
Subject: [PATCH 27/41] [IMP]:hr_holidays:improved view

bzr revid: apa@tinyerp.com-20120626100945-f869ems0hal6v9z0
---
 addons/hr_holidays/hr_holidays_view.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 2de9f718186..daff57bad80 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -86,11 +86,17 @@
                     </group>
                     <notebook colspan="4">
                         <page string="General">
-                            <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
-                            <field name="double_validation" invisible="1"/>
+                            <group>
+                                <group>
+                                    <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                                    <field name="double_validation" invisible="1"/>
+                                </group>
+                                <group>
+                                    <field name="manager_id" groups="base.group_no_one"/>
+                                    <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
+                                </group>
+                            </group>
                             <newline/>
-                            <field name="manager_id" groups="base.group_no_one"/>
-                            <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
                             <field name="notes" nolabel="1" colspan="4" placeholder="Add a reason..."/>
                         </page>
                     </notebook>

From a1221b39dd9d5836e5eb2e73c139d0d9f69da29d Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 15:55:08 +0530
Subject: [PATCH 28/41] [IMP]:hr_holidays:improved view

bzr revid: apa@tinyerp.com-20120626102508-cgcpz3depggh032l
---
 addons/hr_holidays/hr_holidays_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index daff57bad80..3102fdf5f8a 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -73,6 +73,7 @@
                             <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>
                             <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/>
@@ -88,11 +89,10 @@
                         <page string="General">
                             <group>
                                 <group>
-                                    <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
+                                    <field name="manager_id" groups="base.group_no_one"/>
                                     <field name="double_validation" invisible="1"/>
                                 </group>
                                 <group>
-                                    <field name="manager_id" groups="base.group_no_one"/>
                                     <field name="manager_id2" attrs="{'invisible':[('double_validation', '!=', True)]}" groups="base.group_no_one"/>
                                 </group>
                             </group>

From d2db1989848fb6c94fa641e83de2e89fce771456 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 16:28:41 +0530
Subject: [PATCH 29/41] [IMP]:hr,hr_payroll:improved view

bzr revid: apa@tinyerp.com-20120626105841-3fosyc7jnum2vlc4
---
 addons/hr/hr_view.xml                 |  4 +++-
 addons/hr_payroll/hr_payroll_view.xml | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index d26776af5e3..266ade646bf 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -366,7 +366,9 @@
                         <label for="name" class="oe_edit_only"/>
                         <h1>
                             <field name="name" class="oe_inline"/>
-                            (<field name="department_id" class="oe_inline"/>)
+                            <label class="oe_inline" string="(" attrs="{'invisible': [('department_id', '=', False)]}"/>
+                            <field name="department_id" class="oe_inline"/>
+                            <label class="oe_inline" string=")" attrs="{'invisible': [('department_id', '=', False)]}"/>
                         </h1>
                         <label for="employee_ids" class="oe_edit_only"/>
                         <h2>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 422b3722c11..669c9affb37 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -345,14 +345,17 @@
                             </field>
                        </page>
                        <page string="Other Information">
-                            <group col="2">
-                                <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                                <field name="payslip_run_id" domain="[('state','=','draft')]"/>
-                                <field name="paid" readonly="1"/>
-                                <div>
-                                    <field name="note" Placeholder="Add an internal note..."/>
-                                </div>
+                            <group>
+                                <group>
+                                    <field name="company_id" groups="base.group_multi_company"/>
+                                    <field name="payslip_run_id" domain="[('state','=','draft')]"/>
+                                    <field name="paid" readonly="1"/>
+                                </group>
+                                <group/>
                             </group>
+                            <div colspan="4">
+                                <field name="note" Placeholder="Add an internal note..."/>
+                            </div>
                        </page>
                     </notebook>
                     </sheet>

From 2a50a8d1385d6057f306ef16b6713aa88c03cc72 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Tue, 26 Jun 2012 16:50:09 +0530
Subject: [PATCH 30/41] [FIX]:hr_evaluation:Unknown field state in domain
 [['state','not in',['waiting_answer','done','cancel']]]

bzr revid: apa@tinyerp.com-20120626112009-yrirtuqm4zby47dj
---
 addons/hr_evaluation/hr_evaluation_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 29abd73c7dc..b4e37d5bf8e 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -192,12 +192,12 @@
                                             <field name="response" readonly="1"/>
                                         </group>
                                     </group>
-                                    <!--<group col="4" string="Status">-->
-                                    <!--     <field name="state"/>-->
-                                    <!--     <div>-->
-                                    <!--         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />-->
-                                    <!--     </div>-->
-                                    <!--</group>-->
+                                    <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" />
+                                         </div>
+                                    </group>
                                 </form>
                             </field>
                         </page>

From 1325558868c6b23851122135a01146a2f6f394f9 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 28 Jun 2012 18:42:10 +0530
Subject: [PATCH 31/41] [IMP]:improved HR Application view after reviewed

bzr revid: apa@tinyerp.com-20120628131210-gpy7i3d2ekg6b7da
---
 addons/hr/hr_view.xml                                 |  8 +++++---
 addons/hr_attendance/hr_attendance_view.xml           |  3 ++-
 addons/hr_contract/hr_contract_view.xml               | 10 ++++++----
 addons/hr_holidays/hr_holidays_view.xml               | 10 ++++++----
 addons/hr_payroll/hr_payroll_view.xml                 | 10 ++++++----
 addons/hr_timesheet/hr_timesheet_view.xml             |  9 +++++++--
 addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml |  4 ++--
 7 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 266ade646bf..5483d066fe8 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -48,15 +48,17 @@
                         </group>
                         <notebook>
                             <page string="Information">
-                                <group col="4">
-                                    <group string="Linked User">
+                                <group>
+                                    <group>
                                         <field name="parent_id" />
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
-                                        <field name="identification_id" groups="base.group_hr_user"/>
+                                        <!--<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"/>
+                                    </group>
+                                    <group name="active_group">
                                         <field name="active"/>
                                     </group>
                                 <!-- <group string="General">
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 306caa76a22..ff707d3453a 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -136,7 +136,8 @@
                 <field name="active" position="before">
 					<label for="state"/>
 					<div>
-						<field name="state" class="oe_inline"/> 
+						<field name="state" class="oe_inline"/>
+						<label/>
 						<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"/>
 					</div>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index bb74e35ddb4..0c6d9617a3c 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -12,10 +12,12 @@
                     <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>
+					<xpath expr="//group[@name='active_group']" position="before">
+                        <group>
+							<field name="vehicle"/>
+							<field name="vehicle_distance"/>
+						</group>
+                    </xpath>
                     <field name="active" position="before">
                         <field name="medic_exam" string="Medical Examination"/>
                     </field>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 3102fdf5f8a..4b2f3707ac2 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -489,11 +489,13 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <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"/>
+                    <label for="remaining_leaves"/>
+                    <div>
+                        <field name="remaining_leaves" class="oe_inline"/>
+                        <label/>
+                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 669c9affb37..f789f85e2c1 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -422,10 +422,12 @@
                     <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>
+                    <xpath expr="//group[@name='active_group']" position="before">
+                        <group>
+							<field name="vehicle"/>
+							<field name="vehicle_distance"/>
+						</group>
+                    </xpath>
                     <field name="active" position="before">
                         <field name="medic_exam" string="Medical Examination"/>
                     </field>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 24ab5d2b43c..169824e7475 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -114,9 +114,14 @@
             <field name="arch" type="xml">
                 <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
+                        <div class="oe_right oe_button_box" name="button_timesheet">
+                            <!-- Put here related buttons -->
+                        </div>
                         <group col="4">
-                            <field name="product_id" domain="[('type','=','service')]"/>
-                            <field name="journal_id"/>
+                            <group col="2">
+                                <field name="product_id" domain="[('type','=','service')]"/>
+                                <field name="journal_id"/>
+                            </group>
                         </group>
                     </page>
                 </page>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 157ff40e3d8..bd691fc0032 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -360,9 +360,9 @@
       <record id="hr_timesheet_sheet_employee_extd_form" model="ir.ui.view">
             <field name="name">hr.timesheet.sheet.employee.extd_form</field>
             <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_box']" position="inside">
+                <xpath expr="//div[@name='button_timesheet']" position="inside">
                     <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
                 </xpath>
             </field>

From faddab4935cb9e4fc054a097f54a25b42c355106 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 29 Jun 2012 12:14:43 +0530
Subject: [PATCH 32/41] [IMP]reorganize group in contract form and remove total
 from my timesheet

bzr revid: sgo@tinyerp.com-20120629064443-kwyp4r59620qse3k
---
 addons/hr_contract/hr_contract_view.xml        |  9 +++------
 addons/hr_payroll/hr_payroll_view.xml          |  2 +-
 .../hr_payroll_account_view.xml                |  9 +++++----
 .../hr_timesheet_sheet_view.xml                |  3 ---
 .../l10n_be_hr_payroll_view.xml                | 18 ++++++++++--------
 5 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 0c6d9617a3c..447461cee1a 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -84,16 +84,13 @@
                                     <field name="date_end" />
                                     <field name="working_hours"/>
                                 </group>
-                                <group string="Trial Period">
+                                <group name="trail" string="Trial Period">
                                     <field name="trial_date_start" />
                                     <field name="trial_date_end" />
+                                    <separator string="Advantages" colspan="2"/>
+                                    <field name="advantages" nolabel="1"/>
                                 </group>
                             </group>
-							<group>
-								<group name="right_column" string="Advantages">
-									<field name="advantages" nolabel="1"/>
-								</group>
-							</group>
                             <separator string="Notes"/>
                             <field name="notes"/>
                         </page>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index f789f85e2c1..cca555bafa6 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -18,7 +18,7 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='right_column']" position="before">
+                <xpath expr="//group[@name='trail']" position="after">
                     <group string="Payslip Info">
                         <field name="struct_id" required="1"/>
                     </group>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index e06a43588c4..ff0293a27f6 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -44,10 +44,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//field[@name='advantages']" position="after">
-                   <separator colspan="4" string="Accounting"/>
-                    <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                    <field name="journal_id"/>
+                <xpath expr="//group[@name='trail']" position="after">
+                   <group string="Accounting">
+                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                        <field name="journal_id"/>
+                    </group>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index bd691fc0032..36827fe7c48 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -106,7 +106,6 @@
                             </group>
                             <group col="4">
                                 <field name="state_attendance"/>
-                                <field name="total_attendance_day" widget="float_time"/>
                             </group>
                             <field colspan="4" context="{'date':date_current,'user_id':user_id}" domain="[('name','=',date_current)]" name="timesheet_ids" nolabel="1">
                                 <tree editable="top" string="Timesheet Lines">
@@ -136,8 +135,6 @@
                                     <field name="user_id" required="1"/>
                                 </form>
                             </field>
-                            <field name="total_difference_day" widget="float_time"/>
-                            <field name="total_timesheet_day" widget="float_time"/>
                         </page>
                         <page string="Summary">
                             <field colspan="4" name="period_ids" nolabel="1">
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index 5482b9a8a2b..c40ddbc3a78 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -15,15 +15,17 @@
                     <field name="misc_onss_deduction"/>
                     <field name="meal_voucher_amount"/>
                     <field name="misc_advantage_amount"/>
-                    <separator string="Miscellaneous" colspan="2"/>
-                    <field name="additional_net_amount"/>
-                    <field name="retained_net_amount"/>
                  </xpath>
-                 <xpath expr="//field[@name='trial_date_end']" position="after">
-                    <separator string="By Worker" colspan="2"/>
-                    <field name="insurance_employee_deduction"/>
-                    <field name="meal_voucher_employee_deduction"/>
-                    <field name="car_employee_deduction"/>
+                 <xpath expr="//group[@name='trail']" position="after">
+                     <group string="Miscellaneous">
+                         <field name="additional_net_amount"/>
+                         <field name="retained_net_amount"/>
+                     </group>
+                    <group string="By Worker">
+                        <field name="insurance_employee_deduction"/>
+                        <field name="meal_voucher_employee_deduction"/>
+                        <field name="car_employee_deduction"/>
+                    </group>
                  </xpath>
             </data>
             </field>

From 621e546580e503720e9e5a2c8d9ac19115e38cea Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 29 Jun 2012 14:19:33 +0530
Subject: [PATCH 33/41] [IMP]improve view as per review

bzr revid: sgo@tinyerp.com-20120629084933-q6g14p68wwt818v7
---
 addons/hr_holidays/hr_holidays_view.xml       |  8 ++--
 addons/hr_timesheet/hr_timesheet_view.xml     | 43 +++++++++++--------
 .../hr_timesheet_sheet_view.xml               |  2 +-
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 4b2f3707ac2..cff01b599e1 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -79,9 +79,11 @@
                             <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"/> - 
-                                <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
-                                <field name="number_of_days_temp"/> days
+                                <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>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 169824e7475..399c31c148b 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -26,29 +26,38 @@
             <field name="model">hr.analytic.timesheet</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Timesheet Lines">
-                    <group col="4">
-                        <field name="name" colspan="4"/>
-                        <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
-                        <field name="date" on_change="on_change_date(date)"/>
+                <form string="Timesheet Lines" version="7.0">
+                    <sheet>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_id" on_change="on_change_user_id(user_id)" required="1"/>
+                        </group>
+                        <group>
+                            <field name="date" on_change="on_change_date(date)"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Information">
-                            <group>
-                                <group string="Product">
-                                    <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
-                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)"/>
-                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" widget="float_time"/>
-                                </group>
-                                <group string="Accounting">
-                                    <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
-                                    <field name="amount"/>
-                                    <field name="general_account_id"/>
-                                    <field name="journal_id"/>
-                                </group>
+                        <group>
+                            <group string="Product">
+                                <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
+                                <label string="Quantity" for="unit_amount" align="1.0"/>
+                                <div>
+                                    <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
+                                    <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
+                                </div>
                             </group>
+                            <group string="Accounting">
+                                <field domain="[('type','=','normal'),('state', '&lt;&gt;', 'close'),('parent_id','!=',False)]" name="account_id" select="1"/>
+                                <field name="amount"/>
+                                <field name="general_account_id"/>
+                                <field name="journal_id"/>
+                            </group>
+                        </group>
                         </page>
                     </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 36827fe7c48..8d0a6d1bec6 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -231,7 +231,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_line_search"/>
             <field name="arch" type="xml">
-                <field name="user_id" position="before">
+                <field name="date" position="before">
                     <field name="sheet_id"/>
                 </field>
             </field>

From 996a8795015fe44952532cbb2a6df73cdd35a0c7 Mon Sep 17 00:00:00 2001
From: "Sanjay Gohel (Open ERP)" <sgo@tinyerp.com>
Date: Fri, 29 Jun 2012 14:36:43 +0530
Subject: [PATCH 34/41] [IMP]hr_job:improve job position view

bzr revid: sgo@tinyerp.com-20120629090643-3s988dh0ryf7iy5o
---
 addons/hr/hr_view.xml                         | 12 ++++++++----
 addons/hr_evaluation/hr_evaluation_view.xml   | 14 +++++++++-----
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 5483d066fe8..76e162160cf 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -377,10 +377,14 @@
                             <field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
                         </h2>
                         <group col="4">
-                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
-                            <field name="no_of_employee"/>
-                            <field name="expected_employees"/>
+                            <group>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                                <field name="no_of_employee"/>
+                                <field name="expected_employees"/>
+                            </group>
+                            <group>
+                                <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="Description">
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index b4e37d5bf8e..6818cdb0fe6 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -28,11 +28,15 @@
             <field name="arch" type="xml">
                 <form string="Appraisal Plan" version="7.0">
                     <group col="4">
-                        <field name="name"/>
-                        <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                        <field name="month_first"/>
-                        <field name="month_next"/>
-                        <field name="active"/>
+                        <group>
+                            <field name="name"/>
+                            <field name="active"/>
+                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="month_first"/>
+                            <field name="month_next"/>
+                        </group>
                     </group>
                      <notebook>
                          <page string="Appraisal Phases">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index ed57698258e..560826e4c27 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -342,7 +342,7 @@
         <field name="type">form</field>
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
-            <field name="expected_employees" version="7.0" position="after">
+            <field name="no_of_recruitment" version="7.0" position="after">
                 <label for="survey_id" />
                 <div>
                     <field name="survey_id" class="oe_inline"/>

From 8ee0fb34bab5493d99738972c8d3f9126543b77e Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 14:59:40 +0530
Subject: [PATCH 35/41] [IMP]:hr_holidays:improved holidays view

bzr revid: apa@tinyerp.com-20120629092940-f0bgquhszllt0vvi
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index cff01b599e1..aad81a389f7 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -308,7 +308,7 @@
         <record model="ir.actions.act_window.view" id="action_request_approve_holidays_form">
             <field name="sequence" eval="2"/>
             <field name="view_mode">form</field>
-            <field name="view_id" ref="allocation_leave_new"/>
+            <field name="view_id" ref="edit_holiday_new"/>
             <field name="act_window_id" ref="request_approve_holidays"/>
         </record>
 

From e74341be06a11d010cd65cb384c0afb70c717ce8 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 15:06:08 +0530
Subject: [PATCH 36/41] [IMP]:improved evaoaution view

bzr revid: apa@tinyerp.com-20120629093608-fx9xt5c4kc9n4fj3
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 6818cdb0fe6..5e08301d834 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -30,8 +30,8 @@
                     <group col="4">
                         <group>
                             <field name="name"/>
-                            <field name="active"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            <field name="active"/>
                         </group>
                         <group>
                             <field name="month_first"/>

From 2ae4d917b0fad30ca8252c518f6ef4be81dbb418 Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Fri, 29 Jun 2012 15:20:28 +0530
Subject: [PATCH 37/41] [IMP]:improve job position

bzr revid: apa@tinyerp.com-20120629095028-e4xolvuef04te7bx
---
 addons/hr/hr_view.xml                         |  4 ++--
 addons/hr_recruitment/hr_recruitment_view.xml | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 6bd3de11253..2f12f48b096 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -377,10 +377,10 @@
                         <group col="4">
                             <group>
                                 <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                                <field name="no_of_employee"/>
-                                <field name="expected_employees"/>
                             </group>
                             <group>
+                                <field name="no_of_employee"/>
+                                <field name="expected_employees"/>
                                 <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                             </group>
                         </group>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 560826e4c27..2cbf3a0d341 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -343,14 +343,14 @@
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
             <field name="no_of_recruitment" version="7.0" position="after">
-                <label for="survey_id" />
-                <div>
-                    <field name="survey_id" class="oe_inline"/>
-                    <button class="oe_inline"
-                        string="Interview" icon="gtk-print"
-                        name="action_print_survey" type="object"
-                        attrs="{'invisible':[('survey_id','=',False)]}"/>
-                </div>
+            <label for="survey_id" />
+            <div>
+                <field name="survey_id" class="oe_inline"/>
+                <button class="oe_inline"
+                    string="Interview" icon="gtk-print"
+                    name="action_print_survey" type="object"
+                    attrs="{'invisible':[('survey_id','=',False)]}"/>
+            </div>
             </field>
         </field>
     </record>

From 6867bc1375aeea3c291c6b9193da9c6b62d4762d Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Wed, 4 Jul 2012 18:29:10 +0200
Subject: [PATCH 38/41] [IMP] review of some hr form view

bzr revid: qdp-launchpad@openerp.com-20120704162910-zatsmoxyu2reaab2
---
 addons/hr/hr_view.xml                         | 14 ++---
 addons/hr_attendance/hr_attendance_view.xml   |  5 +-
 addons/hr_contract/hr_contract.py             |  2 +-
 addons/hr_contract/hr_contract_view.xml       | 58 +++++++++++--------
 addons/hr_holidays/hr_holidays_view.xml       |  4 +-
 addons/hr_payroll/hr_payroll_view.xml         |  6 +-
 addons/hr_recruitment/hr_recruitment_view.xml |  2 +-
 .../l10n_be_hr_payroll_view.xml               | 16 ++---
 8 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 44c65daf895..750b83d6700 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -48,20 +48,18 @@
                             <page string="Information">
                                 <group>
                                     <group>
+                                        <field name="user_id" on_change="onchange_user(user_id)"/>
                                         <field name="parent_id" />
                                         <field name="coach_id"/>
                                     </group>
                                     <group>
-                                        <!--<field name="identification_id" groups="base.group_hr_user"/>-->
+                                        <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"/>
                                     </group>
                                     <group name="active_group">
                                         <field name="active"/>
                                     </group>
-                                <!-- <group string="General">
-                                    <field name="user_id" on_change="onchange_user(user_id)"/>
-                                </group> -->
                                 </group>
                                 <field name="notes" placeholder="Other Information ..." colspan="4"/>
                             </page>
@@ -376,15 +374,15 @@
                         <h2>
                             <field name="employee_ids" widget="many2many_tags" mode="tree,form"/>
                         </h2>
-                        <group col="4">
-                            <group>
-                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                            </group>
+                        <group>
                             <group>
                                 <field name="no_of_employee"/>
                                 <field name="expected_employees"/>
                                 <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
                             </group>
+                            <group>
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="Description">
diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index ff707d3453a..aaee5ed33bf 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -137,9 +137,8 @@
 					<label for="state"/>
 					<div>
 						<field name="state" class="oe_inline"/>
-						<label/>
-						<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"/>
+						<button class="oe_inline oe_right" 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 oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
 					</div>
                 </field>
             </field>
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index 4f82d1b3014..1267f13ac04 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -44,7 +44,7 @@ class hr_employee(osv.osv):
         'place_of_birth': fields.char('Place of Birth', size=30),
         'children': fields.integer('Number of Children'),
         'vehicle': fields.char('Company Vehicle', size=64),
-        'vehicle_distance': fields.integer('Home-Work Distance', help="In kilometers"),
+        'vehicle_distance': fields.integer('Home-Work Dist.', help="In kilometers"),
         'contract_ids': fields.one2many('hr.contract', 'employee_id', 'Contracts'),
         'contract_id':fields.function(_get_latest_contract, string='Contract', type='many2one', relation="hr.contract", help='Latest contract of the employee'),
     }
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 89ec9faa288..37354045d8f 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -8,18 +8,18 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-				<data>
+                <data>
                     <xpath expr="//field[@name='parent_id']" position="before">
                         <field name="manager"/>
                     </xpath>
-					<xpath expr="//group[@name='active_group']" position="before">
+                    <xpath expr="//group[@name='active_group']" position="before">
                         <group>
-							<field name="vehicle"/>
-							<field name="vehicle_distance"/>
-						</group>
+                            <field name="vehicle"/>
+                            <field name="vehicle_distance"/>
+                        </group>
                     </xpath>
                     <field name="active" position="before">
-                        <field name="medic_exam" string="Medical Examination"/>
+                        <field name="medic_exam" string="Medical Exam"/>
                     </field>
                     <field name="birthday" position="before">
                         <field name="children"/>
@@ -30,7 +30,7 @@
                     <field name="bank_account_id" position="replace">
                         <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
                     </field>
-				</data>
+                </data>
             </field>
         </record>
 
@@ -69,26 +69,38 @@
             <field name="arch" type="xml">
                 <form string="Contract" version="7.0">
                     <sheet>
-                    <group col="4">
-                        <field name="name" />
-                        <field name="employee_id" />
-                        <field name="job_id"/>
-                        <field name="wage"/>
-                        <field name="type_id"/>
-                    </group>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" class="oe_inline"/>, <field name="employee_id" class="oe_inline"/>
+                        </h1>
+                        <h2>
+                            <div>
+                                <label for="job_id" class="oe_edit_only"/>
+                                <field name="job_id"/>
+                            </div>
+                            <div>
+                                <label for="type_id" class="oe_edit_only"/>
+                                <field name="type_id"/>
+                            </div>
+                        </h2>
+                    </div>
                     <notebook>
                         <page string="Information" name="information">
                             <group>
-                                <group name="left_column" string="Duration">
-                                    <field name="date_start" />
-                                    <field name="date_end" />
-                                    <field name="working_hours"/>
+                                <group name="salary_and_advantages" string="Salary and Advantages">
+                                    <field name="wage"/>
+                                    <field name="advantages" nolabel="1" placeholder="Advantages..." colspan="2"/>
                                 </group>
-                                <group name="trail" string="Trial Period">
-                                    <field name="trial_date_start" />
-                                    <field name="trial_date_end" />
-                                    <separator string="Advantages" colspan="2"/>
-                                    <field name="advantages" nolabel="1"/>
+                                <group name="left_column" string="Duration">
+                                    <label for="trial_date_start" string="Trial Period Duration"/>
+                                    <div>
+                                        <field name="trial_date_start" class="oe_inline"/> - <field name="trial_date_end" class="oe_inline"/>
+                                    </div>
+                                    <label for="date_start" string="Duration"/>
+                                    <div>
+                                        <field name="date_start" class="oe_inline"/> - <field name="date_end" class="oe_inline"/>
+                                    </div>
+                                    <field name="working_hours"/>
                                 </group>
                             </group>
                             <separator string="Notes"/>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 197b19316d6..01d066b62f4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -115,6 +115,7 @@
                             <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="category_id" attrs="{'required':[('holiday_type','=','category')], 'invisible':[('holiday_type','=','employee')], 'readonly':[('state','!=','draft'), ('state','!=','confirm')]}"/>
                             <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}" groups="base.group_hr_user"/>
                         </group>
                         <group>
@@ -173,6 +174,7 @@
                             <field name="name"/>
                             <field name="holiday_type" on_change="onchange_type(holiday_type)" attrs="{'readonly':[('state','!=','draft')]}" string="Allocation Mode" groups="base.group_hr_manager"/>
                             <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>
                         <group>
@@ -541,7 +543,7 @@
                     <div>
                         <field name="remaining_leaves" class="oe_inline"/>
                         <label/>
-                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline"/>
+                        <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" class="oe_inline oe_right"/>
                     </div>
                 </field>
             </field>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 78ef1c9d0b8..5f38b845872 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -45,10 +45,8 @@
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
             <data>
-                <xpath expr="//group[@name='trail']" position="after">
-                    <group string="Payslip Info">
-                        <field name="struct_id" required="1"/>
-                    </group>
+                <xpath expr="//field[@name='wage']" position="after">
+                    <field name="struct_id" required="1"/>
                 </xpath>
                  <xpath expr="//field[@name='working_hours']" position="after">
                     <field name="schedule_pay"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a3dc5036afa..3cb29348089 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -174,7 +174,7 @@
                         <field name="survey" invisible="1"/>
                         <field name="response" invisible="1"/>
                         <field name="department_id" on_change="onchange_department_id(department_id)"/>
-                        <div><field name="state" groups="base.group_no_one"/></div>
+                        <field name="state" groups="base.group_no_one"/>
                     </group>
                 </group>
                 <notebook>
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index c40ddbc3a78..d295888d8b5 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -16,16 +16,12 @@
                     <field name="meal_voucher_amount"/>
                     <field name="misc_advantage_amount"/>
                  </xpath>
-                 <xpath expr="//group[@name='trail']" position="after">
-                     <group string="Miscellaneous">
-                         <field name="additional_net_amount"/>
-                         <field name="retained_net_amount"/>
-                     </group>
-                    <group string="By Worker">
-                        <field name="insurance_employee_deduction"/>
-                        <field name="meal_voucher_employee_deduction"/>
-                        <field name="car_employee_deduction"/>
-                    </group>
+                 <xpath expr="//field[@name='advantages']" position="before">
+                    <field name="additional_net_amount"/>
+                    <field name="retained_net_amount"/>
+                    <field name="insurance_employee_deduction"/>
+                    <field name="meal_voucher_employee_deduction"/>
+                    <field name="car_employee_deduction"/>
                  </xpath>
             </data>
             </field>

From d761f9ef09be61b87ee300bccb42b7a1fbceb84f Mon Sep 17 00:00:00 2001
From: "Amit Patel (OpenERP)" <apa@tinyerp.com>
Date: Thu, 5 Jul 2012 12:28:45 +0530
Subject: [PATCH 39/41] [IMP]:removed tabs

bzr revid: apa@tinyerp.com-20120705065845-bb0lgzwdd93ph2ql
---
 addons/hr_attendance/hr_attendance_view.xml | 12 ++++++------
 addons/hr_payroll/hr_payroll_view.xml       |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index aaee5ed33bf..448e6401cbd 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -134,12 +134,12 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <field name="active" position="before">
-					<label for="state"/>
-					<div>
-						<field name="state" class="oe_inline"/>
-						<button class="oe_inline oe_right" 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 oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
-					</div>
+                    <label for="state"/>
+                    <div>
+                        <field name="state" class="oe_inline"/>
+                        <button class="oe_inline oe_right" 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 oe_right" name="attendance_action_change" states="absent" string="Sign In" type="object" icon="gtk-go-back" context="{'type':'sign_in'}" groups="base.group_hr_user"/>
+                    </div>
                 </field>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 5f38b845872..a6674e01bac 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -449,9 +449,9 @@
                     </xpath>
                     <xpath expr="//group[@name='active_group']" position="before">
                         <group>
-							<field name="vehicle"/>
-							<field name="vehicle_distance"/>
-						</group>
+                            <field name="vehicle"/>
+                            <field name="vehicle_distance"/>
+                        </group>
                     </xpath>
                     <field name="active" position="before">
                         <field name="medic_exam" string="Medical Examination"/>

From e6ef77b047dda7fa74fb984ecad078978e0d6ad6 Mon Sep 17 00:00:00 2001
From: "Quentin (OpenERP)" <qdp-launchpad@openerp.com>
Date: Thu, 5 Jul 2012 11:29:21 +0200
Subject: [PATCH 40/41] [MERGE] hr review of form views

bzr revid: qdp-launchpad@openerp.com-20120705092921-0edv4n7z0392ia83
---
 addons/hr_contract/hr_contract_view.xml       |  2 +-
 addons/hr_evaluation/hr_evaluation_view.xml   | 72 +++++++++----------
 addons/hr_expense/hr_expense.py               |  2 +-
 addons/hr_expense/hr_expense_view.xml         | 33 ++++-----
 addons/hr_expense/report/expense.rml          |  4 +-
 addons/hr_holidays/hr_holidays_view.xml       | 32 +++++----
 addons/hr_payroll/hr_payroll_view.xml         | 63 +++-------------
 .../hr_payroll_account_view.xml               | 21 +++---
 addons/hr_recruitment/hr_recruitment_view.xml |  3 +-
 addons/hr_timesheet/hr_timesheet_view.xml     |  7 +-
 .../hr_timesheet_sheet_view.xml               |  4 +-
 .../l10n_be_hr_payroll_view.xml               |  6 +-
 12 files changed, 97 insertions(+), 152 deletions(-)

diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 37354045d8f..66f486dc9cc 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -91,7 +91,7 @@
                                     <field name="wage"/>
                                     <field name="advantages" nolabel="1" placeholder="Advantages..." colspan="2"/>
                                 </group>
-                                <group name="left_column" string="Duration">
+                                <group name="duration_group" string="Duration">
                                     <label for="trial_date_start" string="Trial Period Duration"/>
                                     <div>
                                         <field name="trial_date_start" class="oe_inline"/> - <field name="trial_date_end" class="oe_inline"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 9988c39ae66..a5efaf42347 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -164,55 +164,49 @@
                 </header>
                 <sheet>
                     <label for="employee_id" class="oe_edit_only"/>
-                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)"/></h1>
+                    <h1><field name="employee_id" on_change="onchange_employee_id(employee_id)" class="oe_inline"/>, <field name="date" class="oe_inline"/></h1>
                     <label for="plan_id" class="oe_edit_only"/>
                     <h2><field name="plan_id"/></h2>
                     <group>
-                        <group>
-                            <field name="date"/>
-                        </group>
-                        <group attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
+                        <group colspan="4" attrs="{'invisible':['|', ('state','=','draft'), ('state', '=', 'wait')]}">
                             <field name="rating" attrs="{'readonly':[('state','&lt;&gt;','progress')]}"/>
                             <field name="date_close" readonly="1"/>
                         </group>
                     </group>
-                    <notebook>
-                        <page string="Appraisal" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="survey_request_ids">
-                                <form string="Interview Appraisal" version="7.0">
-                                    <div class="oe_right oe_button_box">
-                                        <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                                        <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>
+                    <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="survey_request_ids">
+                            <form string="Interview Appraisal" version="7.0">
+                                <div class="oe_right oe_button_box">
+                                    <button name="%(survey.action_view_survey_question_message)d" string="Answer Survey" type="action" states="waiting_answer,done,cancel" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                                    <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>
+                                <group>
                                     <group>
-                                        <group>
-                                            <field name="survey_id"/>
-                                            <field name="user_to_review_id"/>
-                                            <field name="user_id" string="Interviewer"/>
-                                        </group>
-                                        <group>
-                                            
-                                            <field name="date_deadline"/>
-                                            <field name="response" readonly="1"/>
-                                        </group>
+                                        <field name="survey_id"/>
+                                        <field name="user_to_review_id"/>
+                                        <field name="user_id" string="Interviewer"/>
                                     </group>
-                                    <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" />
-                                         </div>
+                                    <group>              
+                                        <field name="date_deadline"/>
+                                        <field name="response" readonly="1"/>
                                     </group>
-                                </form>
-                            </field>
-                        </page>
-                        <page string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_action"
-                                groups="base.group_hr_manager"/>
-                        </page>
-                        <page string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
-                            <field name="note_summary"/>
-                        </page>
-                    </notebook>
+                                </group>
+                                <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" />
+                                     </div>
+                                </group>
+                            </form>
+                        </field>
+                    </group>
+                    <group string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="note_action"
+                            groups="base.group_hr_manager" placeholder="Appraisal Summary..."/>
+                    </group>
+                    <group string="Public Notes" attrs="{'invisible':[('state','=','draft')]}">
+                        <field nolabel="1" name="note_summary" placeholder="Action Plan..."/>
+                    </group>
               </sheet>
               </form>
             </field>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 9d7ec10cc28..b1192701dfb 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -56,12 +56,12 @@ class hr_expense_expense(osv.osv):
             return self.pool.get('res.currency').search(cr, uid, [('rate','=',1.0)], context=context)[0]
 
     _name = "hr.expense.expense"
+    _inherit = ['mail.thread']
     _description = "Expense"
     _order = "id desc"
     _columns = {
         'name': fields.char('Description', size=128, required=True),
         'id': fields.integer('Sheet ID', readonly=True),
-        'ref': fields.char('Reference', size=32),
         'date': fields.date('Date', select=True),
         'journal_id': fields.many2one('account.journal', 'Force Journal', help = "The journal used when the expense is invoiced"),
         'employee_id': fields.many2one('hr.employee', "Employee", required=True),
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index ec2ff849ecb..b8868c3319f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -49,7 +49,6 @@
                     <field name="employee_id"/>
                     <field name="date"/>
                     <field name="department_id"/>
-                    <field name="ref"/>
                     <field name="name"/>
                     <field name="amount"/>
                     <field name="state"/>
@@ -74,14 +73,18 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                 </header>
                 <sheet>
-                    <group col="4">
-                        <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
-                        <field name="name"/>
-                        <field name="ref"/>
-                        <field name="date"/>
-                        <field name="currency_id"/>
-                        <field name="department_id"/>
-                        <field name="company_id" groups="base.group_multi_company"/>
+                    <group>
+                        <group>
+                            <field name="employee_id" on_change="onchange_employee_id(employee_id)"/>
+                            <field name="date"/>
+                            <field name="department_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
+                        </group>
+                        <group>
+                            <field name="name"/>
+                            <field name="user_valid"/>
+                            <field name="currency_id"/>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Description">
@@ -106,6 +109,8 @@
                                     </group>
                                 </form>
                             </field>
+                            <separator string="Notes"/>
+                            <field name="note" placeholder="Free Notes"/>
                         </page>
                         <page string="Other Info">
                             <group>
@@ -113,17 +118,13 @@
                                     <field name="journal_id"/>
                                     <field name="invoice_id" context="{'type':'in_invoice', 'journal_type': 'purchase'}"/>
                                 </group>
-                                <group groups="base.group_no_one" string="Validation">
-                                    <field name="date_confirm" readonly="1"/>
-                                    <field name="date_valid" readonly="1"/>
-                                    <field name="user_valid"/>
-                                </group>
                             </group>
-                            <separator string="Notes"/>
-                            <field name="note"/>
                         </page>
                     </notebook>
                 </sheet>
+                <footer>
+                    <field name="message_ids" widget="mail_thread"/>
+                </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
index d0d73aa5ca4..bf456cfc4d6 100644
--- a/addons/hr_expense/report/expense.rml
+++ b/addons/hr_expense/report/expense.rml
@@ -160,7 +160,7 @@
           <para style="terp_tblheader_General_Centre">Date</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Reference</para>
+          <para style="terp_tblheader_General_Centre">Description</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Validated By</para>
@@ -176,7 +176,7 @@
           <para style="terp_default_Centre_8">[[ formatLang(o.date,date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.ref ]]</para>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ o.user_valid.name ]]</para>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 01d066b62f4..1237cdb14f4 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -420,20 +420,24 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Leave Type" version="7.0">
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="name"/>
-                                <field name="categ_id"/>
-                                <field name="color_name"/>
-                                <field name="active"/>
-                            </group>
-                            <group>
-                                <field name="double_validation"/>
-                                <field name="limit"/>
-                            </group>
-                        </group>
-                    </sheet>
+                    <group col="4">
+                        <field name="name"/>
+                        <field name="categ_id"/>
+                    </group>
+                    <notebook>
+                      <page string="Details">
+                          <group>
+                              <group name="selection" string="Validation">
+                                  <field name="double_validation"/>
+                                  <field name="limit"/>
+                              </group>
+                              <group name="second" string="Misc">
+                                  <field name="color_name"/>
+                                  <field name="active"/>
+                              </group>
+                          </group>
+                      </page>
+                    </notebook>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index a6674e01bac..bae89ed215b 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -7,36 +7,6 @@
         <menuitem id="menu_hr_root_payroll" parent="hr.menu_hr_root" name="Payroll" sequence="30"/>
         <menuitem id="menu_hr_payroll_reporting" parent="hr.menu_hr_reporting" name="Payroll" groups="base.group_hr_manager"/>
 
-        <!-- Employee View -->
-        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2</field>
-            <field name="model">hr.employee</field>
-            <field name="inherit_id" ref="hr.view_employee_form"/>
-            <field name="arch" type="xml">
-            <data>
-                <xpath expr="//page[@string='Personal Information']" position="after">
-                    <page string="Miscellaneous" groups="base.group_hr_user">
-                        <group colspan="2" col="2">
-                            <separator string="Personal Info" colspan="2"/>
-                            <field name="bank_account_id" context="{'display_partner':True, 'partner_id':partner_id}"/>
-                            <field name="place_of_birth"/>
-                            <field name="children"/>
-                            <!-- <field name="basic" invisible="0"/> -->
-                        </group>
-                        <group colspan="2" col="2">
-                            <separator string="Job Info" colspan="2"/>
-                            <field name="manager" />
-                            <field name="vehicle" />
-                            <field name="vehicle_distance" />
-                            <field name="medic_exam"  string="Medical Examination"/>
-                        </group>
-                    </page>
-                </xpath>
-            </data>
-            </field>
-        </record>
-        <!-- End Employee View -->
-
         <!-- Contract View -->
         <record id="hr_contract_form_inherit" model="ir.ui.view">
             <field name="name">hr.contract.view.form.inherit</field>
@@ -291,6 +261,7 @@
                     </group>
                     <notebook>
                         <page string="Worked Days &amp; Inputs">
+                            <separator string="Worked Days"/>
                             <field name="worked_days_line_ids">
                                 <tree string="Worked Days" editable="bottom">
                                     <field name="name"/>
@@ -312,6 +283,7 @@
                                     </group>
                                 </form>
                             </field>
+                            <separator string="Other Inputs"/>
                             <field name="input_line_ids" colspan="4" nolabel="1">
                                 <tree string="Input Data" editable="bottom">
                                     <field name="name"/>
@@ -371,12 +343,13 @@
                        </page>
                        <page string="Other Information">
                             <group>
-                                <group>
+                                <group string="Miscellaneous">
                                     <field name="company_id" groups="base.group_multi_company"/>
                                     <field name="payslip_run_id" domain="[('state','=','draft')]"/>
+                                </group>
+                                <group name="accounting" string="Accounting">
                                     <field name="paid" readonly="1"/>
                                 </group>
-                                <group/>
                             </group>
                             <div colspan="4">
                                 <field name="note" Placeholder="Add an internal note..."/>
@@ -435,8 +408,8 @@
                     groups="base.group_hr_manager"/>
 
         <!-- Employee View -->
-        <record id="hr_contract.hr_hr_employee_view_form2" model="ir.ui.view">
-            <field name="name">hr.hr.employee.view.form2</field>
+        <record id="payroll_hr_employee_view_form" model="ir.ui.view">
+            <field name="name">payroll.hr.employee.view.form</field>
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
@@ -444,27 +417,6 @@
                     <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>
-                    <xpath expr="//group[@name='active_group']" position="before">
-                        <group>
-                            <field name="vehicle"/>
-                            <field name="vehicle_distance"/>
-                        </group>
-                    </xpath>
-                    <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>
@@ -797,6 +749,7 @@
                     <group col="4">
                         <field name="credit_note"/>
                     </group>
+                    <separator string="Payslips"/>
                     <field name="slip_ids"/>
                 </sheet>
                 </form>
diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml
index 03c625e054a..9e3aab3ecb6 100644
--- a/addons/hr_payroll_account/hr_payroll_account_view.xml
+++ b/addons/hr_payroll_account/hr_payroll_account_view.xml
@@ -2,8 +2,6 @@
 <openerp>
     <data>
 
-
-
         <record model="ir.ui.view" id="view_hr_payslip_inherit_form">
             <field name="name">hr.payslip.inherit.form</field>
             <field name="model">hr.payslip</field>
@@ -27,10 +25,12 @@
             <field name="arch" type="xml">
               <xpath expr="/form/notebook/page[@string='Child Rules']" position="after">
                     <page string="Accounting">
-                        <field name="account_debit" />
-                        <field name="account_credit"/>
-                        <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
-                        <field name="account_tax_id"/>
+                        <group colspan="4">
+                            <field name="account_debit" />
+                            <field name="account_credit"/>
+                            <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
+                            <field name="account_tax_id"/>
+                        </group>
                     </page>
                 </xpath>
             </field>
@@ -44,7 +44,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_contract.hr_contract_view_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//group[@name='trail']" position="after">
+                <xpath expr="//group[@name='duration_group']" position="after">
                    <group string="Accounting">
                         <field name="analytic_account_id" groups="analytic.group_analytic_accounting"/>
                         <field name="journal_id"/>
@@ -52,7 +52,7 @@
                 </xpath>
             </field>
         </record>
-        
+
     <!-- Payslip Run View -->
 
         <record id="hr_payslip_run_search_inherit" model="ir.ui.view">
@@ -86,12 +86,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr_payroll.hr_payslip_run_form"/>
             <field name="arch" type="xml">
-                <field name="date_end" position="after">
-                    <newline/>
+                <field name="credit_note" position="before">
                     <field name="journal_id"/>
                 </field>
             </field>
         </record>
-        
+
     </data>
 </openerp>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 3cb29348089..c8230787cfe 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -145,8 +145,7 @@
                     <button name="action_print_survey" type="object"
                         string="Print Interview" icon="gtk-print" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
-                </div>
-                
+                </div>             
                 <div class="oe_title">
                     <label for="name" class="oe_edit_only"/>
                     <h1><field name="name"/></h1>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 399c31c148b..7875aff12a0 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -42,7 +42,7 @@
                         <group>
                             <group string="Product">
                                 <field name="product_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" required="1" domain="[('type','=','service')]"/>
-                                <label string="Quantity" for="unit_amount" align="1.0"/>
+                                <label string="Quantity" for="unit_amount"/>
                                 <div>
                                     <field name="unit_amount" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
                                     <field name="product_uom_id" on_change="on_change_unit_amount(product_id, unit_amount, False, product_uom_id,journal_id)" class="oe_inline"/>
@@ -123,10 +123,7 @@
             <field name="arch" type="xml">
                 <page string="Personal Information" position="after">
                     <page string="Timesheets" groups="base.group_hr_user">
-                        <div class="oe_right oe_button_box" name="button_timesheet">
-                            <!-- Put here related buttons -->
-                        </div>
-                        <group col="4">
+                        <group>
                             <group col="2">
                                 <field name="product_id" domain="[('type','=','service')]"/>
                                 <field name="journal_id"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index 649b5334c50..6635c38b909 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -348,7 +348,7 @@
                 </tree>
             </field>
         </record>
-        
+
   <!-- Timesheet Button on Employee Form -->
   <act_window
            context="{'search_default_employee_id': [active_id], 'default_employee_id': active_id}"
@@ -359,7 +359,7 @@
             <field name="model">hr.employee</field>
             <field name="inherit_id" ref="hr_timesheet.hr_timesheet_employee_extd_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//div[@name='button_timesheet']" position="inside">
+                <xpath expr="//div[@name='button_box']" position="inside">
                     <button name="%(act_hr_employee_2_hr_timesheet)d" string="Timesheets" type="action"/>
                 </xpath>
             </field>
diff --git a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
index d295888d8b5..79c7c08ffca 100644
--- a/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
+++ b/addons/l10n_be_hr_payroll/l10n_be_hr_payroll_view.xml
@@ -12,16 +12,14 @@
                  <xpath expr="//field[@name='struct_id']" position="after">
                     <field name="travel_reimbursement_amount"/>
                     <field name="car_company_amount"/>
+                    <field name="car_employee_deduction"/>
                     <field name="misc_onss_deduction"/>
                     <field name="meal_voucher_amount"/>
+                    <field name="meal_voucher_employee_deduction"/>
                     <field name="misc_advantage_amount"/>
-                 </xpath>
-                 <xpath expr="//field[@name='advantages']" position="before">
                     <field name="additional_net_amount"/>
                     <field name="retained_net_amount"/>
                     <field name="insurance_employee_deduction"/>
-                    <field name="meal_voucher_employee_deduction"/>
-                    <field name="car_employee_deduction"/>
                  </xpath>
             </data>
             </field>

From 02f85effd09dc2449299d8fa0a86e1aa0e83095d Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Thu, 5 Jul 2012 14:10:36 +0200
Subject: [PATCH 41/41] [IMP] small usability fix opporutnity

bzr revid: fp@tinyerp.com-20120705121036-tgr9sbauwywt50gg
---
 addons/crm/crm_lead_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 2579fa75cda..24ef8f4ec08 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -471,7 +471,7 @@
                         <label for="planned_revenue" class="oe_edit_only"/>
                         <h2>
                             <field name="planned_revenue" class="oe_inline"/>
-                            <field name="company_currency" class="oe_edit_only oe_inline"/> at 
+                            <field name="company_currency" class="oe_inline"/> at 
                             <field name="probability" class="oe_inline"/> %% success rate
                         </h2>
                     </div>