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