[FIX] hr: remove referecne of res.partner.address

bzr revid: sbh@tinyerp.com-20120307052100-ylqekp6w7xe72ucd

3 files changed, 6 insertions, 9 deletions

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 76f9295a829..04de2a2147e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -155,10 +155,9 @@ class hr_employee(osv.osv):
         'gender': fields.selection([('male', 'Male'),('female', 'Female')], 'Gender'),
         'marital': fields.selection([('single', 'Single'), ('married', 'Married'), ('widower', 'Widower'), ('divorced', 'Divorced')], 'Marital Status'),
         'department_id':fields.many2one('hr.department', 'Department'),
-        'address_id': fields.many2one('res.partner.address', 'Working Address'),
-        'address_home_id': fields.many2one('res.partner.address', 'Home Address'),
-        'partner_id': fields.related('address_home_id', 'partner_id', type='many2one', relation='res.partner', readonly=True, help="Partner that is related to the current employee. Accounting transaction will be written on this partner belongs to employee."),
-        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',partner_id)]", help="Employee bank salary account"),
+        'address_id': fields.many2one('res.partner', 'Working Address'),
+        'address_home_id': fields.many2one('res.partner', 'Home Address'),
+        'bank_account_id':fields.many2one('res.partner.bank', 'Bank Account Number', domain="[('partner_id','=',address_home_id)]", help="Employee bank salary account"),
         'work_phone': fields.char('Work Phone', size=32, readonly=False),
         'mobile_phone': fields.char('Work Mobile', size=32, readonly=False),
         'work_email': fields.char('Work E-mail', size=240),
@@ -190,7 +189,7 @@ class hr_employee(osv.osv):
 
     def onchange_address_id(self, cr, uid, ids, address, context=None):
         if address:
-            address = self.pool.get('res.partner.address').browse(cr, uid, address, context=context)
+            address = self.pool.get('res.partner').browse(cr, uid, address, context=context)
             return {'value': {'work_email': address.email, 'work_phone': address.phone, 'mobile_phone': address.mobile}}
         return {'value': {}}
 
@@ -198,7 +197,7 @@ class hr_employee(osv.osv):
         address_id = False
         if company:
             company_id = self.pool.get('res.company').browse(cr, uid, company, context=context)
-            address = self.pool.get('res.partner').address_get(cr, uid, [company_id.partner_id.id], ['default'])
+            address = self.pool.get('res.partner').address_get(cr, uid, [company_id.address_id.id], ['default'])
             address_id = address and address['default'] or False
         return {'value': {'address_id' : address_id}}
 
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 29066be2208..6935ebc304a 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -56,8 +56,7 @@
                             <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" on_change="onchange_address_id(address_id)" domain="[('partner_id', '=', partner_id)]"/>
+                                <field name="address_id" colspan="2" on_change="onchange_address_id(address_id)" />
                                 <field name="work_phone"/>
                                 <field name="mobile_phone"/>
                                 <field name="work_email" widget="email" />
diff --git a/addons/hr/security/ir.model.access.csv b/addons/hr/security/ir.model.access.csv
index 2911a49bf53..121e0f23f25 100644
--- a/addons/hr/security/ir.model.access.csv
+++ b/addons/hr/security/ir.model.access.csv
@@ -7,5 +7,4 @@ access_hr_employee_resource_user,resource.resource.user,resource.model_resource_
 access_hr_department_user,hr.department.user,model_hr_department,base.group_hr_user,1,1,1,1

 access_hr_department_employee,hr.department.employee,model_hr_department,base.group_user,1,0,0,0

 access_hr_job_user,hr.job user,model_hr_job,base.group_hr_user,1,1,1,1

-access_hr_res_partner_address,res.partner.address,base.model_res_partner_address,base.group_hr_manager,1,1,1,1

 access_ir_property_hr_user,ir_property hr_user,base.model_ir_property,base.group_hr_user,1,1,1,0