From f0bcdba489e260a66bcd1afdf7be328acb09c0c5 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Fri, 21 Mar 2025 11:06:02 +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     | 3 +--
 yuthon_salary/security/yuthon_salary_group.xml | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index a95073e4a..8c0b845bb 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -142,5 +142,4 @@ 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.total_before_tax = total + record.base_salary + record.performance_bonuses + record.rank_salary
diff --git a/yuthon_salary/security/yuthon_salary_group.xml b/yuthon_salary/security/yuthon_salary_group.xml
index f8d65c43f..ef93adfdd 100644
--- a/yuthon_salary/security/yuthon_salary_group.xml
+++ b/yuthon_salary/security/yuthon_salary_group.xml
@@ -22,7 +22,7 @@
     <record id="yuthon_salary_type_company_rule_manager" model="ir.rule">
         <field name="name">yuthon_salary_company_rule_admin</field>
         <field name="model_id" ref="model_hr_payroll_structure_type"/>
-        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>
+<!--        <field name="domain_force">[('yuthon_company', '=', user.employee_id.yuthon_company)]</field>-->
         <field name="groups" eval="[(4, ref('group_salary_user')), (4, ref('group_salary_admin'))]"/>
     </record>
     <!--职级-->