diff --git a/yuthon_hr_employee/models/yuthon_hr_employee.py b/yuthon_hr_employee/models/yuthon_hr_employee.py index 0032bf8f3..7a7e10966 100644 --- a/yuthon_hr_employee/models/yuthon_hr_employee.py +++ b/yuthon_hr_employee/models/yuthon_hr_employee.py @@ -107,9 +107,9 @@ class YuthonHrEmployee(models.Model): archiving_agency = fields.Char(string="存档机构") over_data_time = fields.Datetime(string="最后更新数据时间") # 工作信息 -- page - normal_overtime_hours = fields.Float(string="正常加班时间(小时)") - weekend_overtime_hours = fields.Float(string="周末加班时间(小时)") - holiday_overtime_hours = fields.Float(string="节假日加班时间(小时)") + normal_overtime_hours = fields.Float(string="正常加班时间(h)") + weekend_overtime_hours = fields.Float(string="周末加班时间(h)") + holiday_overtime_hours = fields.Float(string="节假日加班时间(h)") overtime_this_month = fields.Float(string="本月加班时") overtime_last_month = fields.Float(string="上月加班时") result_overtime = fields.Float(string="结算时") @@ -169,6 +169,7 @@ class YuthonHrEmployee(models.Model): last_month_attendance_deduction = fields.Float(string="上月考勤扣款") last_month_base_salary_deduction = fields.Float(string="上月基本薪资扣款") last_month_performance_deduction = fields.Float(string="上月绩效扣款") + last_month_commuting_deduction = fields.Float(string='上月通信扣款') medical_insurance_base = fields.Float(string='基本医疗费基数', compute='_compute_insurance_bases') pension_insurance_base = fields.Float(string='基本养老费基数', compute='_compute_insurance_bases') work_injury_insurance_base = fields.Float(string='工伤保险费基数', compute='_compute_insurance_bases') @@ -449,10 +450,10 @@ class YuthonHrEmployee(models.Model): else: record.retire_years = 0 - @api.depends('normal_overtime_hours', 'weekend_overtime_hours', 'holiday_overtime_hours') + @api.depends('normal_overtime_hours', 'weekend_overtime_hours') def _compute_all_overtime_hours(self): for record in self: - record.all_overtime_hours = record.normal_overtime_hours + record.weekend_overtime_hours + record.holiday_overtime_hours + record.all_overtime_hours = record.normal_overtime_hours + record.weekend_overtime_hours def hr_employee_time(self): for record in self: diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index 93c408e65..482ddacdd 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -146,13 +146,14 @@ + - - - + + +