From b6532e6a7323851a6e91e13861d5db790793f07d Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sat, 31 May 2025 15:29: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_salary/models/inherit_hr_payslip.py | 13 ++--
.../views/inherit_hr_payslip_views.xml | 66 +++++++++++--------
2 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index 83453fd1f..0d7163cae 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -26,8 +26,8 @@ class InheritHrPayslip(models.Model):
housing_rent = fields.Float(string='累计住房租金')
child_education = fields.Float(string='累计子女教育')
tax = fields.Float(string="税金")
- cpf = fields.Float(string="公积金")
-
+ retroactive_allowance = fields.Float(string="补发津贴")
+ condolence_fund = fields.Float(string="儿童节慰问金")
continuing_education = fields.Float(string='累计继续教育')
elderly_support = fields.Float(string='累计赡养老人')
infant_care = fields.Float(string='累计3岁以下婴幼儿照护')
@@ -63,11 +63,12 @@ class InheritHrPayslip(models.Model):
temporary_performance_bonus = fields.Float(string='临时绩效奖')
attendance_deduction_total = fields.Float(string='考勤扣款合计')
assessment_reserved_amount = fields.Float(string='考核保留量')
- reimburse_performance_bonus = fields.Float(string='上个月多扣绩效补回')
last_year_safety = fields.Float(string='上年安全生产工作奖')
last_year_performance_evaluation = fields.Float(string='上年绩效评优')
social_security = fields.Float(string='2024年社保补缴')
+ performance_up = fields.Float(string='上月多扣绩效补回')
individual_tax_refund = fields.Float(string='2024年个税退回')
+ liquidation_year = fields.Float(string='上年年度清算')
safety_incentives = fields.Float(string='安全生产奖')
is_push = fields.Boolean(string='推送')
is_salary_push = fields.Boolean(string='工资推送')
@@ -81,7 +82,7 @@ class InheritHrPayslip(models.Model):
tax_reduction = fields.Float(string='减免税额')
deduction_standard = fields.Float(string='减除费用标准')
paid_tax = fields.Float(string='已缴税额')
- based_pay = fields.Float(string='临时绩效工资')
+ based_pay = fields.Float(string='临时绩效奖金')
life_salary = fields.Float(string='生活补贴')
january_performance = fields.Float(string='1月份绩效奖金补发')
accumulated_underpayment = fields.Float(string='累计欠收')
@@ -264,7 +265,7 @@ class InheritHrPayslip(models.Model):
@api.depends('total_before_tax', 'basic_endowment_insurance', 'basic_medical_insurance',
'unemployment_insurance', 'housing_provident_fund', 'b_year', 'tax_payable',
'union_dues', 'meal_misunderstanding_fee', 'temporary_performance_bonus',
- 'reimburse_performance_bonus', 'life_salary')
+ 'performance_up', 'life_salary')
def _compute_actual_salary(self):
for record in self:
record.actual_salary = (record.total_before_tax -
@@ -277,7 +278,7 @@ class InheritHrPayslip(models.Model):
record.union_dues -
record.meal_misunderstanding_fee -
record.temporary_performance_bonus -
- record.reimburse_performance_bonus -
+ record.performance_up -
record.life_salary)
def put_button(self):
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 0416bded4..7d9726aca 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -39,43 +39,50 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
@@ -114,6 +121,7 @@
+