From 8432015fba70452d791430ba6733093d1b63ef55 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 31 Jul 2025 21:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_property/views/property_bank_statements_views.xml | 2 +-
 yuthon_salary/models/yuthon_payroll_project.py           | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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