diff --git a/yuthon_salary/models/yuthon_payroll_project.py b/yuthon_salary/models/yuthon_payroll_project.py index 27f0eb8e8..aa677be9a 100644 --- a/yuthon_salary/models/yuthon_payroll_project.py +++ b/yuthon_salary/models/yuthon_payroll_project.py @@ -224,7 +224,7 @@ class YuthonPayrollInsurances (models.Model): formula_salary = "result = employee.social_base_on * " + str(number) if ins.name == '住房公积金': code = 'ZFGJJ' - formula_salary = "result = (round((employee.housing_fund_base * " + str(number) + "), 0)) if employee.is_accum_salary else 0" + formula_salary = "result = 0.0 if employee.total_coefficients == 0 else round((employee.converted/employee.total_coefficients * employee.conversion_factor * 0.08 * 0.5)/12, 2)" if ins.name == '工会会费': code = 'GHHF' formula_salary = "result = round((payslip.base_salary * 0.005), 2)"