!4227 !4226 添加功能

Merge pull request !4227 from 李鹏宇/dev

yuthon_property/views/property_bank_statements_views.xml

@@ -16,7 +16,7 @@
                 <field name="account_code" optional="hide"/>
                 <field name="remake"/>
                 <field name="registered"/>
-                <field name="original_amount"/>
+                <field name="original_amount" readonly="1"/>
                 <field name="yes_amount"/>
                 <field name="no_amount"/>
                 <field name="contract_account" optional="hide"/>

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 == '天河物管':