From 8a7fefc1126968614b85e6a5c23dc8bd5b83f52a Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 27 Mar 2025 20:41:29 +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       | 4 ++--
 yuthon_salary/views/inherit_hr_payslip_views.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index 02b1ee96c..b7b5f3612 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -176,7 +176,7 @@ class InheritHrPayslip(models.Model):
             "target": "new",
         }
 
-    @api.depends('line_ids','year_compute', 'year_jie', 'year_gong')
+    @api.depends('line_ids','year_compute', 'year_jie', 'year_gong', 'jing_te')
     def _compute_total_before_tax(self):
         common_records = self.env['yuthon.payroll.common'].search([('before_tax', '=', True)])
         name_list = [record.name for record in common_records]
@@ -185,7 +185,7 @@ class InheritHrPayslip(models.Model):
             for line in record.line_ids:
                 if line.name in name_list:
                     total += line.total
-            record.total_before_tax = total + record.base_salary + record.performance_bonuses + record.rank_salary + record.year_compute + record.year_jie + record.year_gong
+            record.total_before_tax = total + record.base_salary + record.performance_bonuses + record.rank_salary + record.year_compute + record.year_jie + record.year_gong, record.jing_te
 
     def put_button(self):
         for record in self:
diff --git a/yuthon_salary/views/inherit_hr_payslip_views.xml b/yuthon_salary/views/inherit_hr_payslip_views.xml
index 84507e51d..9cf07f342 100644
--- a/yuthon_salary/views/inherit_hr_payslip_views.xml
+++ b/yuthon_salary/views/inherit_hr_payslip_views.xml
@@ -41,8 +41,8 @@
                 <field name="base_salary_deduction"/>
                 <field name="assessment_reserved_amount"/>
                 <field name="study_on"/>
-                <field name="total_before_tax"/>
                 <field name="jing_te"/>
+                <field name="total_before_tax"/>
                 <field name="basic_medical_insurance"/>
                 <field name="basic_endowment_insurance"/>
                 <field name="unemployment_insurance"/>
@@ -183,8 +183,8 @@
                 <field name="year_jie"/>
                 <field name="year_gong"/>
                 <field name="study_on"/>
-                <field name="total_before_tax" string="税前合计"/>
                 <field name="jing_te"/>
+                <field name="total_before_tax" string="税前合计"/>
                 <field name="basic_endowment_insurance"/>
                 <field name="basic_medical_insurance"/>
                 <field name="unemployment_insurance"/>