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 @@ yuthon_salary_company_rule_admin - [('yuthon_company', '=', user.employee_id.yuthon_company)] +