diff --git a/yuthon_salary/models/yuthon_payroll_project.py b/yuthon_salary/models/yuthon_payroll_project.py index 6f0d796ea..5ed908699 100644 --- a/yuthon_salary/models/yuthon_payroll_project.py +++ b/yuthon_salary/models/yuthon_payroll_project.py @@ -73,7 +73,7 @@ class YuthonPayrollCommon(models.Model): if ins.name == '安全生产管理补贴': formula_salary = "result = 320 if employee.department_id.name != '领导班子' else 0" if ins.name == '工龄补贴': - formula_salary = "result = 0" + formula_salary = "result = min(400, employee.cumulative_year * 10 + employee.cumulative_year.company_old * 20) if employee.department_id.name != '领导班子' else 0" if ins.name == '岗位绩效': formula_salary = "result = 0" if ins.name == '高温补贴': @@ -90,6 +90,9 @@ class YuthonPayrollCommon(models.Model): formula_salary = "result = 0" if ins.name == '质检员津贴': formula_salary = "result = 0" + + if ins.name == '工会会费' and ins.company_id.name == '天河物管': + formula_salary = "result = 0" if ins.name == '工会会费' and ins.company_id.name == '天河粮储': formula_salary = "result = 20 if employee.job_id.name in ['总经理', '副总经理'] else \ 15 if employee.job_id.name in ['部门经理', '副经理'] else \