diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py index 0d7163cae..df480cbfd 100644 --- a/yuthon_salary/models/inherit_hr_payslip.py +++ b/yuthon_salary/models/inherit_hr_payslip.py @@ -53,8 +53,7 @@ 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) b_year = fields.Float(string='企业(职业)年金', compute='_compute_salary', store=True) - total_before_tax = fields.Float(string='本期收入', compute='_compute_total_before_tax', store=True) - total_tax = fields.Float(string='本期应收', compute='_compute_total_before_tax', store=True) + total_before_tax = fields.Float(string='本期应收', compute='_compute_total_before_tax', store=True) year_compute = fields.Float(string='前年年度清算', store=True) year_jie = fields.Float(string='上年年度结余', store=True) year_gong = fields.Float(string='年功奖', store=True) diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml index 7d9726aca..c187033d0 100644 --- a/yuthon_salary/views/inherit_hr_payslip_views.xml +++ b/yuthon_salary/views/inherit_hr_payslip_views.xml @@ -36,13 +36,16 @@ - + + + + + - @@ -55,8 +58,6 @@ - - @@ -75,10 +76,8 @@ - - - - + +