diff --git a/yuthon_property/views/property_bank_statements_views.xml b/yuthon_property/views/property_bank_statements_views.xml index b3bb54adc..cde93d9f6 100644 --- a/yuthon_property/views/property_bank_statements_views.xml +++ b/yuthon_property/views/property_bank_statements_views.xml @@ -16,7 +16,7 @@ - + diff --git a/yuthon_salary/models/yuthon_payroll_project.py b/yuthon_salary/models/yuthon_payroll_project.py index f434dc0fc..a2d620194 100644 --- a/yuthon_salary/models/yuthon_payroll_project.py +++ b/yuthon_salary/models/yuthon_payroll_project.py @@ -74,7 +74,9 @@ class YuthonPayrollCommon(models.Model): if ins.name == '全勤奖' and ins.company_id.name == '天河物管': formula_salary = "result = 100 if employee.last_attendance else 0" if ins.name == '加班费': - formula_salary = "result = 0 if (employee.is_annual_salary or employee.contract_id.structure_type_id.name == '工勤返聘') else (round(((employee.all_overtime_hours - 40) * (payslip.base_salary / 21.75 / 8) * 1.5), 0) if employee.all_overtime_hours > 40 else 0)" + formula_salary = "result = c if (employee.is_annual_salary or employee.contract_id.structure_type_id.name == '工勤返聘') else (round(((employee.all_overtime_hours - 40) * (payslip.base_salary / 21.75 / 8) * 1.5), 0) if employee.all_overtime_hours > 40 else 0)" + if ins.name == '岗位工资': + formula_salary = "result = 0" if ins.name == '安全生产管理补贴': formula_salary = "result = employee.security_amount " if ins.name == '工龄补贴' and ins.company_id.name == '天河物管':