diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py index 455402198..5125a4688 100644 --- a/yuthon_hr_employee/models/yuthon_hr_employee.py +++ b/yuthon_hr_employee/models/yuthon_hr_employee.py @@ -172,10 +172,10 @@ class YuthonHrEmployee(models.Model): ('9', '九月'), ('10', '十月'), ('11', '十一月'), ('12', '十二月')], string='薪资计算月份') salary_year_jin_ids = fields.Many2many( - 'hr.employee', # 自关联到hr.employee - relation='hr_employee_salary_year_jin_rel', # 显式指定关联表名 - column1='employee_id', # 当前员工ID在关联表中的字段名 - column2='related_employee_id', # 关联员工ID在关联表中的字段名 + 'hr.employee', + relation='hr_employee_salary_year_jin_rel', + column1='employee_id', + column2='related_employee_id', string='薪资计算年金人员' ) salary_year = fields.Integer(compute='_compute_salary_year', store=True) @@ -193,10 +193,10 @@ class YuthonHrEmployee(models.Model): last_month_performance_deduction = fields.Float(string="上月绩效扣款") last_month_commuting_deduction = fields.Float(string='上月通信扣款') # 薪资计算 基数 - salary_medical_insurance = fields.Float(string='薪资医疗费基数', compute='_compute_insurance_salary', store=True) - salary_insurance = fields.Float(string='薪资养老费基数', compute='_compute_insurance_salary', store=True) - salary_work_injury_insurance = fields.Float(string='薪资保险金基数', compute='_compute_insurance_salary', store=True) - salary_housing_fund = fields.Float(string='薪资公积金基数', compute='_compute_insurance_salary', store=True) + salary_medical_insurance = fields.Float(string='薪资医疗费基数', compute='_compute_insurance_salary') + salary_insurance = fields.Float(string='薪资养老费基数', compute='_compute_insurance_salary') + salary_work_injury_insurance = fields.Float(string='薪资保险金基数', compute='_compute_insurance_salary') + salary_housing_fund = fields.Float(string='薪资公积金基数', compute='_compute_insurance_salary') # 显示基数 medical_insurance_base = fields.Float(string='基本医疗费基数', compute='_compute_insurance_bases') pension_insurance_base = fields.Float(string='基本养老费基数', compute='_compute_insurance_bases') @@ -267,6 +267,7 @@ class YuthonHrEmployee(models.Model): record.subsidy_amount = amount record.quality_inspector_amount = quality_amount + @api.depends('converted', 'salary_year_jin_ids') def _compute_total_coefficients(self): for record in self: