添加功能
This commit is contained in:
@@ -148,8 +148,6 @@ class SalaryComputeWizard(models.Model):
|
||||
result = line.total * internship_days / days + line.total * work_days / days
|
||||
else:
|
||||
result = line.total * internship_days / days
|
||||
elif field_name == 'union_dues':
|
||||
result = line.total
|
||||
elif field_name in ['rank_salary', 'base_salary']:
|
||||
int_value = int(line.total)
|
||||
ones_digit = int_value % 10
|
||||
@@ -161,6 +159,9 @@ class SalaryComputeWizard(models.Model):
|
||||
result = rounded_value * 0.8 * internship_days / days + rounded_value * work_days / days
|
||||
else:
|
||||
result = rounded_value * 0.8 * internship_days / days
|
||||
elif field_name == 'union_dues': # 单独处理工会会费
|
||||
base_salary = getattr(internship_id, 'base_salary', 0)
|
||||
result = base_salary / 0.8 * 0.05
|
||||
else:
|
||||
if work_days != days:
|
||||
result = line.total * 0.8 * internship_days / days + line.total * work_days / days
|
||||
|
||||
Reference in New Issue
Block a user