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] [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>