[MERGE] hr : remove res.partner.address reference from hr related module
bzr revid: sbh@tinyerp.com-20120307062156-ss19y135miwkc0q2
This commit is contained in:
Bhumika (OpenERP)
+5
-6
@@ -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}}
|
||||
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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
|
||||
|
||||
|
@@ -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'),
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
@@ -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
|
||||
|
||||
|
@@ -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'])
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user