添加功能

2025-03-21 11:06:02 +08:00
parent 807a897ab4
commit f0bcdba489
2 changed files with 2 additions and 3 deletions
@@ -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
@@ -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>
    <!--职级-->