From b6146b77b5e8df87bd6b77d0a3690dda739ecdaa Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 9 Jun 2025 15:24:16 +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_salary/models/inherit_hr_payslip.py | 4 ++++
yuthon_salary/models/yuthon_payroll_project.py | 4 +++-
yuthon_salary/views/inherit_hr_payslip_views.xml | 4 +++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index 5eb2d64d1..397d354bd 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -117,6 +117,10 @@ class InheritHrPayslip(models.Model):
# 粮储常用项
quality_allowance = fields.Float(string='质检员津贴')
environmental_allowance = fields.Float(string='环境作业津贴')
+ last_duty = fields.Float(string='上月值班费')
+ high_subsidy = fields.Float(string='高温补贴')
+
+
performance_deduction = fields.Float(string='扣发绩效奖金', compute='_compute_deduction', store=True)
commuting_deduction = fields.Float(string='扣发通信补贴', compute='_compute_deduction', store=True)
base_salary_deduction = fields.Float(string='扣发基本工资', compute='_compute_deduction', store=True)
diff --git a/yuthon_salary/models/yuthon_payroll_project.py b/yuthon_salary/models/yuthon_payroll_project.py
index f2166c665..063d2e7f7 100644
--- a/yuthon_salary/models/yuthon_payroll_project.py
+++ b/yuthon_salary/models/yuthon_payroll_project.py
@@ -76,9 +76,11 @@ class YuthonPayrollCommon(models.Model):
formula_salary = "result = 0"
if ins.name == '岗位绩效':
formula_salary = "result = 0"
+ if ins.name == '高温补贴':
+ formula_salary = "result = 0"
if ins.name == '优秀部门经理/员工':
formula_salary = "result = 0"
- if ins.name == '值班费':
+ if ins.name == '上月值班费':
formula_salary = "result = 0"
if ins.name == '年金（系数）':
formula_salary = "result = 0"
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 69e33b7a9..f9eab451a 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -58,6 +58,8 @@
+
+
@@ -235,7 +237,7 @@
-
+