From 7bb6837fa45b65c713a0617d807b615f5f348d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 27 Mar 2025 22:50:09 +0800 Subject: [PATCH 1/2] 1 --- yuthon_salary/models/yuthon_payroll_project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_salary/models/yuthon_payroll_project.py b/yuthon_salary/models/yuthon_payroll_project.py index a30fcd44c..0a92612e4 100644 --- a/yuthon_salary/models/yuthon_payroll_project.py +++ b/yuthon_salary/models/yuthon_payroll_project.py @@ -189,7 +189,7 @@ class YuthonPayrollInsurances (models.Model): formula_salary = "result = employee.work_injury_insurance_base * " + str(number) if ins.name == '住房公积金': code = 'ZFGJJ' - formula_salary = "result = round((employee.housing_fund_base * " + str(number) + "), 2)" + formula_salary = "result = round((employee.housing_fund_base * 0.12), 2)" if ins.name == '工会会费': code = 'GHHF' formula_salary = "result = round((payslip.base_salary * 0.005), 2)" From ba628d36ee1586d39a8c89c1a23d90cb113d15bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?= Date: Thu, 27 Mar 2025 22:52:22 +0800 Subject: [PATCH 2/2] 1 --- yuthon_salary/models/inherit_hr_payslip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py index 143bd4333..a545c3b41 100644 --- a/yuthon_salary/models/inherit_hr_payslip.py +++ b/yuthon_salary/models/inherit_hr_payslip.py @@ -186,7 +186,7 @@ class InheritHrPayslip(models.Model): for line in record.line_ids: if line.name in name_list: total += line.total - record.total_before_tax = total + record.base_salary + record.performance_bonuses + record.rank_salary + record.year_compute + record.year_jie + record.year_gong + record.jing_te + record.total_before_tax = total + record.base_salary + record.performance_bonuses + record.rank_salary + record.year_compute + record.year_jie + record.year_gong + record.jing_te + record.high_temperature_allowance def put_button(self): for record in self: