diff --git a/yuthon_hr_employee/security/hr_company_security_group.xml b/yuthon_hr_employee/security/hr_company_security_group.xml index ef9eeabf4..f679269d2 100644 --- a/yuthon_hr_employee/security/hr_company_security_group.xml +++ b/yuthon_hr_employee/security/hr_company_security_group.xml @@ -36,4 +36,13 @@ + + 合同公司过滤 + + [('yuthon_company', '=', user.employee_id.yuthon_company)] + + + + + diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py index 8d3addc21..1c4e67bdc 100644 --- a/yuthon_salary/models/inherit_hr_payslip.py +++ b/yuthon_salary/models/inherit_hr_payslip.py @@ -54,9 +54,9 @@ class InheritHrPayslip(models.Model): if line.name == '高温补贴': rec.high_temperature_allowance = line.total if line.name == '通讯补贴': - rec.communication_allowance = line.total + rec.commuting_allowance = line.total if line.name == '全勤奖': - rec.full_attendance_bonus = line.total + rec.full_attendance_award = line.total if line.name == '加班费': rec.overtime_pay = line.total if line.name == '误餐费':