!3127 添加功能

Merge pull request !3127 from 李鹏宇/dev_zhou
2025-06-06 07:35:12 +00:00
parent ff5040de86 9f1af78e07
commit 596f7d108e
1 changed files with 2 additions and 2 deletions
@@ -163,14 +163,14 @@ class SalaryComputeWizard(models.Model):
                            elif field_name == 'union_dues':  # 单独处理工会会费
                                base_salary = getattr(internship_id, 'base_salary', 0)
                                result = base_salary * 0.005
-                            elif field_name == 'housing_fund':  # 单独处理住房公积金
+                            elif field_name == 'housing_provident_fund':  # 单独处理住房公积金
                                # 获取合同入职日期的年份和月份
                                contract_year = str(contract_start_date.year)
                                contract_month = str(contract_start_date.month)
                                # 判断是否为入职当月
                                if contract_year == self.select_year and contract_month == self.select_time:
                                    result = 0  # 入职当月住房公积金为0
-                            elif field_name == 'enterprise_annuity':  # 新增企业年金计算
+                            elif field_name == 'b_year':  # 新增企业年金计算
                                # 获取合同转正日期的年份和月份
                                if contract_end_date:  # 确保转正日期存在
                                    contract_end_year = str(contract_end_date.year)