From 9485ec3db9e9c8813e4c078da35ff815626ac8bd Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sat, 31 May 2025 15:44:35 +0800
Subject: [PATCH 1/2] =?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       | 3 +--
 yuthon_salary/views/inherit_hr_payslip_views.xml | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

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..ebdcff64c 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -37,12 +37,15 @@
                 <field name="struct_id" string="职级"/>
                 <field name="bank_account_id"/>
                 <field name="actual_salary" decoration-danger="1"/>
+                <field name="total_before_tax" decoration-danger="1" decoration-bf="1"/>
+                <field name="b_year" decoration-danger="1"/>
+                <field name="tax_payable" decoration-danger="1" decoration-bf="1"/>
+                 <field name="union_dues" decoration-danger="1" decoration-bf="1"/>
                 <field name="base_salary" required="1"/>
                 <field name="rank_salary" required="1"/>
                 <field name="performance_bonuses" required="1"/>
                 <field name="post_salary"  required="1"  decoration-success="1"/>
                 <field name="seniority_salary" required="1" decoration-success="1"/>
-                <field name="union_dues" decoration-success="1"/>
                 <field name="high_temperature_allowance" decoration-success="1"/>
                 <field name="commuting_allowance" required="1" decoration-success="1"/>
                 <field name="full_attendance_award" decoration-success="1"/>
@@ -55,8 +58,6 @@
                 <field name="basic_medical_insurance" decoration-info="1"/>
                 <field name="unemployment_insurance" decoration-info="1"/>
                 <field name="housing_provident_fund" decoration-info="1"/>
-                <field name="union_dues" decoration-info="1"/>
-                <field name="b_year" decoration-info="1"/>
                 <field name="work_injury_insurance" decoration-info="1"/>
                 <field name="specialized_deduction" decoration-warning="1"/>
                 <field name="infant_care" decoration-warning="1"/>
@@ -77,8 +78,6 @@
                 <field name="study_on" decoration-danger="1"/>
                  <field name="commuting_deduction" decoration-danger="1" decoration-bf="1"/>
                 <field name="performance_deduction" decoration-danger="1" decoration-bf="1"/>
-                <field name="total_before_tax" decoration-danger="1" decoration-bf="1"/>
-                <field name="tax_payable" decoration-danger="1" decoration-bf="1"/>
                 <field name="deduction_standard" decoration-danger="1"/>
                 <field name="safety_incentives" decoration-danger="1"/>
                 <field name="last_year_safety" decoration-danger="1"/>

From 6c7f4319659e3c266124e03e6ee70e89fbe65685 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sat, 31 May 2025 15:45:22 +0800
Subject: [PATCH 2/2] =?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/views/inherit_hr_payslip_views.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index ebdcff64c..c187033d0 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -36,9 +36,9 @@
                 <field name="date_of_entry"/>
                 <field name="struct_id" string="职级"/>
                 <field name="bank_account_id"/>
-                <field name="actual_salary" decoration-danger="1"/>
+                <field name="actual_salary" decoration-danger="1" decoration-bf="1"/>
                 <field name="total_before_tax" decoration-danger="1" decoration-bf="1"/>
-                <field name="b_year" decoration-danger="1"/>
+                <field name="b_year" decoration-danger="1" decoration-bf="1"/>
                 <field name="tax_payable" decoration-danger="1" decoration-bf="1"/>
                  <field name="union_dues" decoration-danger="1" decoration-bf="1"/>
                 <field name="base_salary" required="1"/>
@@ -76,8 +76,8 @@
                 <field name="jing_te" decoration-danger="1"/>
                 <field name="year_gong" decoration-danger="1"/>
                 <field name="study_on" decoration-danger="1"/>
-                 <field name="commuting_deduction" decoration-danger="1" decoration-bf="1"/>
-                <field name="performance_deduction" decoration-danger="1" decoration-bf="1"/>
+                 <field name="commuting_deduction" decoration-danger="1"/>
+                <field name="performance_deduction" decoration-danger="1"/>
                 <field name="deduction_standard" decoration-danger="1"/>
                 <field name="safety_incentives" decoration-danger="1"/>
                 <field name="last_year_safety" decoration-danger="1"/>