From a0f1b7296224b66f347e894a667621c16c9a7d9d Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sun, 23 Mar 2025 17:54:53 +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 | 22 ++++++-------------
.../views/inherit_hr_payslip_views.xml | 1 +
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index 943701615..c57d2c1f0 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -43,13 +43,15 @@ class InheritHrPayslip(models.Model):
work_injury_insurance = fields.Float(string='工伤保险费', compute='_compute_salary', store=True)
housing_provident_fund = fields.Float(string='住房公积金', compute='_compute_salary', store=True)
total_before_tax = fields.Float(string='税前合计', compute='_compute_total_before_tax', store=True)
- year_compute = fields.Float(string='年度清算', compute='_compute_salary', store=True)
- year_jie = fields.Float(string='年度结余', compute='_compute_salary', store=True)
- year_gong = fields.Float(string='年功奖', compute='_compute_salary', store=True)
- study_on = fields.Float(string='学习进步奖', compute='_compute_salary', store=True)
- jing_te = fields.Float(string='经营特别奖', compute='_compute_salary', store=True)
+ year_compute = fields.Float(string='年度清算')
+ year_jie = fields.Float(string='年度结余')
+ year_gong = fields.Float(string='年功奖')
+ study_on = fields.Float(string='学习进步奖')
+ jing_te = fields.Float(string='经营特别奖')
+ temporary_performance_bonus = fields.Float(string='临时绩效奖')
attendance_deduction_total = fields.Float(string='考勤扣款合计')
assessment_reserved_amount = fields.Float(string='考核保留量')
+ reimburse_performance_bonus = fields.Float(string='上个月多扣绩效补回')
is_push = fields.Boolean(string='推送')
is_salary_push = fields.Boolean(string='工资推送')
@@ -112,16 +114,6 @@ class InheritHrPayslip(models.Model):
rec.work_injury_insurance = line.total
if line.name == '住房公积金':
rec.housing_provident_fund = line.total
- if line.name == '年度清算':
- rec.year_compute = line.total
- if line.name == '年度结余':
- rec.year_jie = line.total
- if line.name == '年功奖':
- rec.year_gong = line.total
- if line.name == '学习进步奖':
- rec.study_on = line.total
- if line.name == '经营特别奖':
- rec.jing_te = line.total
def put_payslip(self):
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 06adbe270..1eaa5e3fc 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -49,6 +49,7 @@
+