pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!5473 !5472 添加功能

Browse Source 
Merge pull request !5473 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-09-29 03:12:56 +00:00
committed by Gitee
parent de9617261d 6788ee8184
commit cec1024e55
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/wizard/salary_compute_wizard.py
+5 -6
View File
@@ -311,18 +311,17 @@ class SalaryComputeWizard(models.Model):
result = abs(line.total)*-1 # 或其他合理默认值
elif field_name == 'b_year':
if contract_end_date:
select_year = self.select_year
select_month = self.select_time
select_year = int(self.select_year)
select_month = int(self.select_time)
next_month = contract_end_date.month + 1
next_year = contract_end_date.year
if next_month > 12:
next_month = 1
next_year += 1
next_year_str = str(next_year)
next_month_str = str(next_month)
next_year = int(next_year)
next_month = int(next_month)
# 判断：选中年月 >= 转正后下个月
if (select_year > next_year_str) or \
(select_year == next_year_str and select_month >= next_month_str):
if (select_year > next_year) or (select_year == next_year and select_month >= next_month):
last_year_salary = internship_id.employee_id.last_year_salary or 0
result = last_year_salary * 0.002
else: