diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index c0a95afd2..943701615 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -43,6 +43,11 @@ 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)
attendance_deduction_total = fields.Float(string='考勤扣款合计')
assessment_reserved_amount = fields.Float(string='考核保留量')
is_push = fields.Boolean(string='推送')
@@ -107,6 +112,16 @@ 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 a34d7ab02..62da3fbc4 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -44,6 +44,11 @@
+
+
+
+
+
@@ -124,6 +129,11 @@
+
+
+
+
+
@@ -135,7 +145,7 @@
hr.payslip.tree
hr.payslip
-
+
@@ -153,6 +163,11 @@
+
+
+
+
+