From c6968eaf3e4fcb54be5bb0fa61ebd2a11a62635e Mon Sep 17 00:00:00 2001
From: Mantavya Gajjar <mga@tinyerp.com>
Date: Thu, 7 Oct 2010 13:01:31 +0530
Subject: [PATCH] [FIX]: fix a usability problem for the hr and payroll related
 to the employee passport informaion

bzr revid: mga@tinyerp.com-20101007073131-ba4dkusjnz6kuj8d
---
 addons/hr/hr.py                       |  3 ++-
 addons/hr/hr_view.xml                 | 39 ++++++++++++++-------------
 addons/hr_payroll/hr_payroll_view.xml |  2 +-
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index d638f8191dd..af9b0db7afc 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -127,7 +127,8 @@ class hr_employee(osv.osv):
         'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
         'coach_id': fields.many2one('hr.employee', 'Coach'),
         'job_id': fields.many2one('hr.job', 'Job'),
-        'photo': fields.binary('Photo')
+        'photo': fields.binary('Photo'),
+        'passport_id':fields.char('Passport', size=64)
     }
 
     def onchange_company(self, cr, uid, ids, company, context=None):
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 7d2cec69667..44f01057085 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -36,31 +36,32 @@
                     <notebook colspan="6">
                         <page string="Personal Information">
                             <group col="2" colspan="2">
-                            <separator colspan="2" string="Social IDs"/>
-                            <field name="ssnid"/>
-                            <field name="sinid" groups="base.group_extended"/>
-                            <field name="identification_id" groups="base.group_extended"/>
+                                <separator colspan="2" string="Social IDs"/>
+                                <field name="ssnid"/>
+                                <field name="sinid" groups="base.group_extended"/>
+                                <field name="identification_id" groups="base.group_extended"/>
+                                <field name="passport_id"/>
                             </group>
                             <group col="2" colspan="2">
-                            <separator string="Status" colspan="2"/>
-                            <field name="gender"/>
-                            <field name="marital" widget="selection"/>
-                            <field name="country_id"/>
-                            <field name="birthday"/>
+                                <separator string="Status" colspan="2"/>
+                                <field name="gender"/>
+                                <field name="marital" widget="selection"/>
+                                <field name="country_id"/>
+                                <field name="birthday"/>
                             </group>
                             <group col="2" colspan="2">
-                            <separator string="Contact Information" colspan="2"/>
-                            <field name="address_home_id" colspan="2"/>
-                            <field name="partner_id" invisible="1" />
-                            <field name="address_id" colspan="2" domain="[('partner_id', '=', partner_id)]"/>
-                            <field name="work_phone"/>
-                            <field name="work_email" widget="email" />
-                            <field name="work_location"/>
+                                <separator string="Contact Information" colspan="2"/>
+                                <field name="address_home_id" colspan="2"/>
+                                <field name="partner_id" invisible="1" />
+                                <field name="address_id" colspan="2" domain="[('partner_id', '=', partner_id)]"/>
+                                <field name="work_phone"/>
+                                <field name="work_email" widget="email" />
+                                <field name="work_location"/>
                             </group>
                             <group col="2" colspan="2">
-                            <separator string="Position" colspan="2"/>
-                            <field name="job_id" domain="[('state','!=','old')]"/>
-                            <field name="coach_id" />
+                                <separator string="Position" colspan="2"/>
+                                <field name="job_id" domain="[('state','!=','old')]"/>
+                                <field name="coach_id" />
                             </group>
                         </page>
                         <page string="Categories">
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 962b613158b..e2dd9b99122 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -221,7 +221,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
-                <field name="identification_id" position="after">
+                <field name="passport_id" position="replace">
                     <field name="passport_id"/>
                 </field>
             </field>