diff --git a/yuthon_hr_attendance/models/hr_attendance_month.py b/yuthon_hr_attendance/models/hr_attendance_month.py index 95b5d767c..c3a3fcc78 100644 --- a/yuthon_hr_attendance/models/hr_attendance_month.py +++ b/yuthon_hr_attendance/models/hr_attendance_month.py @@ -104,7 +104,7 @@ class HrAttendanceMonthDetail(models.Model): leave_of_absence = fields.Integer(string="事假") statutory_leave = fields.Integer(string="法定假") work_overtime = fields.Integer(string="加班") - entry_date = fields.Date(related='employee_id.open_start_time', string="入职日期") + entry_date = fields.Date(related='employee_id.entry_date', string="入职日期") expected_date = fields.Date(string="离职日期") cop_leave = fields.Float(string='补休') annual_leave = fields.Float(string='年假') diff --git a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py index a8ee6278c..aa7c450ac 100644 --- a/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_leaving_approval.py @@ -19,7 +19,7 @@ class YuthonLeavingApproval(models.Model): documents_ids = fields.Many2many('ir.attachment', string="附件") id_number = fields.Char(related='employee_id.identification_id', string="身份证号") job_id = fields.Many2one(related='employee_id.job_id', string="岗位") - onboarding_time = fields.Date(related='employee_id.open_start_time', string="入职日期") + onboarding_time = fields.Date(related='employee_id.entry_date', string="入职日期") expected_departure_date = fields.Date(string="预计离职日期") departure_type = fields.Selection([ ('voluntary', '主动离职'), diff --git a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py index 84ad54c8d..93fbf4ba1 100644 --- a/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_reassignment_approval.py @@ -15,8 +15,8 @@ class YuthonReassignmentApproval(models.Model): phone = fields.Char(related='employee_id.work_phone',string='联系电话') job_id = fields.Many2one(related='employee_id.job_id', string="主岗") duties_id = fields.Many2one(related='employee_id.job_id', string="职务") - onboarding_date = fields.Date(related='employee_id.open_start_time', string="任职日期") - end_of_contract = fields.Date(related='employee_id.open_start_time',string="入职日期") + onboarding_date = fields.Date(related='employee_id.entry_date', string="任职日期") + end_of_contract = fields.Date(related='employee_id.entry_date',string="入职日期") parent_id = fields.Many2one(related='employee_id.parent_id', string="直线上级") business_superior_id = fields.Many2one("hr.employee", string="业务上级") place_of_work = fields.Char(string="工作地点") diff --git a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py index dbb847c62..689036dee 100644 --- a/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_regularization_approval.py @@ -15,7 +15,7 @@ class YuthonRegularizationPrepareApproval(models.Model): default=lambda self: self.env['ir.sequence'].next_by_code('yuthon_regularization_approval_code')) job_id = fields.Many2one(related='employee_id.job_id', string="主岗") phone = fields.Char(related='employee_id.mobile_phone', string='手机号') - onboarding_time = fields.Date(string="入职日期") + onboarding_time = fields.Date(related='employee_id.entry_date', string="入职日期") trial_end_date = fields.Date(related='employee_id.open_start_time', string="试用期结束日期") parent_id = fields.Many2one(related='employee_id.parent_id',string="直线上级") business_leader = fields.Char(string="业务线上级") diff --git a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py index cc9df2a3e..40699de1b 100644 --- a/yuthon_hr_employee_approval/models/yuthon_retired_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_retired_approval.py @@ -18,7 +18,7 @@ class YuthonRetiredApproval(models.Model): phone = fields.Char(related='employee_id.mobile_phone', string="联系方式") id_number = fields.Char(related='employee_id.identification_id', string="身份证号") job_id = fields.Many2one(related='employee_id.job_id', string="岗位") - onboarding_time = fields.Date(related='employee_id.open_start_time', string="入职日期") + onboarding_time = fields.Date(related='employee_id.entry_date', string="入职日期") expected_departure_date = fields.Date(string="预计离职日期") retirement_type = fields.Selection([('normal', '正常退休'), ('special_job_early', '特殊工种提前退休'), ('sick', '病退')], string='退休类型') social_security_card = fields.Char(string='社保卡') diff --git a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py index 9688991c1..4f67a758c 100644 --- a/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_transfer_approval.py @@ -17,7 +17,7 @@ class YutransferApproval(models.Model): main_post = fields.Many2one("hr.job", string="主岗") duties = fields.Char(string="职务") job_type_id = fields.Many2one('hr.job.type', string="岗位类别") - onboarding_date = fields.Date(string="入职日期") + onboarding_date = fields.Date(related='employee_id.entry_date', string="入职日期") end_of_contract = fields.Date(string="任现职日期") straight_superiors = fields.Many2one("hr.employee", string="直线上级") business_superior = fields.Many2one("hr.employee", string="业务上级")