From 700238c5a35f3b25519ed05a5835322d2b61ecc5 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 26 Jun 2025 10:23:50 +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/views/inherit_hr_payslip_views.xml | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index 02038fd94..1a05fae86 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -68,6 +68,7 @@ class InheritHrPayslip(models.Model):
assessment_reserved_amount = fields.Float(string='考核保留量')
last_year_safety = fields.Float(string='上年安全生产工作奖')
last_year_performance_evaluation = fields.Float(string='上年绩效评优')
+ retention_previous_year = fields.Float(string='上年考核保留量')
social_security = fields.Float(string='上年社保补缴')
performance_up = fields.Float(string='上月多扣绩效补回')
individual_tax_refund = fields.Float(string='上年个税退回')
@@ -274,10 +275,11 @@ class InheritHrPayslip(models.Model):
'quality_allowance','high_subsidy', 'environmental_allowance', 'last_duty', 'seniority_salary', 'commuting_allowance','base_salary','performance_bonuses', 'comprehensive_subsidy', 'full_attendance_award', 'overtime_pay', 'based_pay',
'january_performance','position_subsidy', 'safety_incentives', 'temporary_performance_bonus', 'performance_deduction','commuting_deduction',
'base_salary_deduction', 'last_year_performance_evaluation', 'safety_subsidy', 'job_performance','leave_allowance',
- 'duty', 'monthly_overtime', 'annuity', 'excellent_employees', 'leave_absence')
+ 'duty', 'monthly_overtime', 'annuity', 'excellent_employees', 'leave_absence', 'retention_previous_year')
def _compute_total_before_tax(self):
for record in self:
record.total_before_tax = (
+ record.retention_previous_year +
record.position_salary +
record.high_subsidy +
record.last_duty +
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index e3ff95570..eda253cff 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -94,6 +94,7 @@
+
@@ -292,6 +293,7 @@
+