diff --git a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml index 4ee8ee20f..8303b85b4 100644 --- a/yuthon_hr_employee/views/yuthon_hr_employee_views.xml +++ b/yuthon_hr_employee/views/yuthon_hr_employee_views.xml @@ -164,8 +164,8 @@ - + diff --git a/yuthon_salary/models/yuthon_payroll_project.py b/yuthon_salary/models/yuthon_payroll_project.py index 2aec63331..0a84904b5 100644 --- a/yuthon_salary/models/yuthon_payroll_project.py +++ b/yuthon_salary/models/yuthon_payroll_project.py @@ -229,7 +229,7 @@ class YuthonPayrollInsurances (models.Model): code = 'GHHF' formula_salary = "result = round((payslip.base_salary * 0.005), 2)" if ins.name == '企业(职业)年金': - if ins.company_id == '天河物管': + if ins.company_id.name == '天河物管': code = 'WGQYNJ' formula_salary = "result = round((employee.converted/total_coefficients * conversion_factor * 0.08 * 0.5)/12, 2)" else: