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

bzr revid: sbh@tinyerp.com-20120307054919-nux5472zjscght8j

8 files changed, 3 insertions, 18 deletions

diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 68855b79d7d..d1a4ba2c285 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -141,8 +141,6 @@ class hr_applicant(crm.crm_case, osv.osv):
         'email_cc': fields.text('Watchers Emails', size=252, help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
         'probability': fields.float('Probability'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact', \
-                                 domain="[('partner_id','=',partner_id)]"),
         'create_date': fields.datetime('Creation Date', readonly=True, select=True),
         'write_date': fields.datetime('Update Date', readonly=True),
         'stage_id': fields.many2one ('hr.recruitment.stage', 'Stage'),
diff --git a/addons/hr_recruitment/hr_recruitment_demo.yml b/addons/hr_recruitment/hr_recruitment_demo.yml
index a4817fb4499..f51a1fd49f5 100644
--- a/addons/hr_recruitment/hr_recruitment_demo.yml
+++ b/addons/hr_recruitment/hr_recruitment_demo.yml
@@ -12,7 +12,7 @@
 
 -
   !record {model: hr.applicant, id: hr_case_traineemca0}:
-    partner_address_id: base.res_partner_address_14
+    partner_id: base.res_partner_address_14
     date: !eval time.strftime('%Y-%m-10 18:15:00')
     type_id: degree_bac5
     priority: '3'
@@ -70,7 +70,7 @@
     partner_phone: '33968745'
 -
   !record {model: hr.applicant, id: hr_case_traineemca1}:
-    partner_address_id: base.res_partner_address_14
+    partner_id: base.res_partner_address_14
     date: !eval time.strftime('%Y-%m-12 17:49:19')
     type_id: degree_bac5
     partner_name: 'Tina Augustie'
@@ -83,7 +83,7 @@
 
 -
   !record {model: hr.applicant, id: hr_case_programmer}:
-    partner_address_id: base.res_partner_address_14
+    partner_id: base.res_partner_address_14
     date: !eval time.strftime('%Y-%m-12 17:49:19')
     type_id: degree_bac5
     partner_name: 'Shane Williams'
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 69a7c104073..fc00d1302df 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -104,7 +104,6 @@
                                     name="%(action_hr_recruitment_partner_create)d"
                                     icon="gtk-index" type="action" attrs="{'readonly':[('partner_id','!=',False)]}" groups="base.group_partner_manager"/>
                             <newline/>
-                            <field name="partner_address_id" on_change="onchange_partner_address_id(partner_address_id, email_from)" colspan="3"/>
                             <field name="email_from" colspan="3"/>
                             <field name="partner_phone" colspan="3"/>
                             <field name="partner_mobile" colspan="3"/>
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 6ea03bbf114..1a596dfa2c6 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -62,7 +62,6 @@ class hr_recruitment_report(osv.osv):
         'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg", digits_compute=dp.get_precision('Account')),
         'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
-        'partner_address_id': fields.many2one('res.partner.address', 'Partner Contact Name',readonly=True),
         'available': fields.float("Availability"),
         'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
@@ -84,7 +83,6 @@ class hr_recruitment_report(osv.osv):
                      s.state,
                      s.partner_id,
                      s.company_id,
-                     s.partner_address_id,
                      s.user_id,
                      s.job_id,
                      s.type_id,
@@ -110,7 +108,6 @@ class hr_recruitment_report(osv.osv):
                      s.date_closed,
                      s.state,
                      s.partner_id,
-                     s.partner_address_id,
                      s.company_id,
                      s.user_id,
                      s.stage_id,
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 07f160b8ee2..994102cab43 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -14,7 +14,6 @@
                 <field name="department_id" invisible="1"/>
                 <field name="type_id" invisible="1"/>
                 <field name="partner_id" invisible="1"/>
-                <field name="partner_address_id" invisible="1"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="state" invisible="1"/>
                 <field name="year" invisible="1"/>
diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv
index 6449cc60fda..6bbc30b7b41 100644
--- a/addons/hr_recruitment/security/ir.model.access.csv
+++ b/addons/hr_recruitment/security/ir.model.access.csv
@@ -5,7 +5,6 @@ access_hr_recruitment_stage_user,hr.recruitment.stage.user,model_hr_recruitment_
 access_hr_recruitment_degree,hr.recruitment.degree,model_hr_recruitment_degree,base.group_hr_user,1,1,1,1

 access_mail_message_user,mail.message.user,mail.model_mail_message,base.group_hr_user,1,1,1,1

 access_res_partner_hr_user,res.partner.user,base.model_res_partner,base.group_hr_user,1,1,1,1

-access_res_partner_address_hr_user,res.partner.address.user,base.model_res_partner_address,base.group_hr_user,1,1,1,1

 access_survey_hr_user,survey.hr.user,survey.model_survey,base.group_hr_user,1,1,1,0

 access_crm_phonecall_hruser,crm.phonecall hruser,crm.model_crm_phonecall,base.group_hr_user,1,1,1,1

 access_crm_meeting_hruser,crm.meeting.hruser,crm.model_crm_meeting,base.group_hr_user,1,1,1,1

diff --git a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
index dd1667aecef..d7a099e7257 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py
@@ -42,7 +42,6 @@ class hr_recruitment_partner_create(osv.osv_memory):
     def make_order(self, cr, uid, ids, context=None):
         mod_obj = self.pool.get('ir.model.data')
         partner_obj = self.pool.get('res.partner')
-        contact_obj = self.pool.get('res.partner.address')
         case_obj = self.pool.get('hr.applicant')
 
         if context is None:
@@ -59,10 +58,6 @@ class hr_recruitment_partner_create(osv.osv_memory):
                 'name': case.partner_name or case.name,
                 'user_id': case.user_id.id,
                 'comment': case.description,
-            }, context=context)
-            contact_id = contact_obj.create(cr, uid, {
-                'partner_id': partner_id,
-                'name': case.partner_name,
                 'phone': case.partner_phone,
                 'mobile': case.partner_mobile,
                 'email': case.email_from
@@ -70,7 +65,6 @@ class hr_recruitment_partner_create(osv.osv_memory):
 
             case_obj.write(cr, uid, case.id, {
                 'partner_id': partner_id,
-                'partner_address_id': contact_id
             }, context=context)
         if data['close']:
             case_obj.case_close(cr, uid, context['active_ids'])
diff --git a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
index 0f7d30b215a..12c294c20bc 100644
--- a/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
+++ b/addons/hr_recruitment/wizard/hr_recruitment_phonecall.py
@@ -99,7 +99,6 @@ class job2phonecall(osv.osv_memory):
                         'date': form.deadline,
                         'description': job.description,
                         'partner_id': job.partner_id.id,
-                        'partner_address_id': job.partner_address_id.id,
                         'partner_phone': job.partner_phone,
                         'partner_mobile': job.partner_mobile,
                         'description': job.description,