Merge pull request !2995 from dev
This commit is contained in:
李鹏宇
2025-05-31 09:52:42 +00:00
committed by Gitee
2 changed files with 3 additions and 2 deletions
+2 -1
View File
@@ -274,7 +274,7 @@ class InheritHrPayslip(models.Model):
)
@api.depends('total_before_tax', 'basic_endowment_insurance', 'basic_medical_insurance',
'unemployment_insurance', 'housing_provident_fund', 'b_year', 'tax_payable',
'unemployment_insurance', 'housing_provident_fund', 'b_year', 'tax_payable', 'social_security',
'union_dues')
def _compute_actual_salary(self):
for record in self:
@@ -285,6 +285,7 @@ class InheritHrPayslip(models.Model):
record.housing_provident_fund -
record.b_year -
record.tax_payable -
record.social_security -
record.union_dues)
def put_button(self):
@@ -39,7 +39,7 @@
<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" decoration-bf="1"/>
<field name="tax_payable" decoration-danger="1" decoration-bf="1"/>
<field name="tax_payable" decoration-danger="1" decoration-bf="1" readonly="1"/>
<field name="union_dues" decoration-danger="1" decoration-bf="1"/>
<field name="base_salary" required="1"/>
<field name="rank_salary" required="1"/>