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

!3132 !3131 添加功能

Browse Source 
Merge pull request !3132 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-06-06 08:46:19 +00:00
committed by Gitee
parent f5f46e92cc 8687da764e
commit e93fa67397
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_salary/models/yuthon_payroll_project.py
+5 -5
View File
@@ -76,13 +76,13 @@ class YuthonPayrollCommon(models.Model):
formula_salary = "result = 0"
if ins.name == '岗位绩效':
formula_salary = "result = 0"
if ins.name == '优秀员工':
if ins.name == '优秀部门经理/员工':
formula_salary = "result = 0"
if ins.name == '值班':
if ins.name == '值班费':
formula_salary = "result = 0"
if ins.name == '年金':
if ins.name == '年金（系数）':
formula_salary = "result = 0"
if ins.name == '六一儿童节福利':
if ins.name == '六一儿童节福利费':
formula_salary = "result = 0"
if ins.name == '环境作业津贴':
formula_salary = "result = 0"
@@ -95,7 +95,7 @@ class YuthonPayrollCommon(models.Model):
10 if employee.job_id.name else 0"
if ins.name == '岗位补贴':
formula_salary = "result = 100 if employee.job_id.name == '会计' else \
600 if '司机' in [role.name for role in user_role_ids] else \
600 if '司机' in [role.name for role in employee.user_role_ids] else \
200 if employee.department_id.name in ['高压班', '运行班'] else \
0"
if ins.name not in sal.rule_ids.mapped('name'):