Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26764 from nabinhait/addl_salary_fix

Browse Source 
fix: Additional salary processing
This commit is contained in:
Nabin Hait 2021-08-06 10:24:03 +05:30 committed by GitHub
commit 418d478dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
erpnext/payroll/doctype/salary_slip/salary_slip.py
View File

@ -647,10 +647,13 @@ class SalarySlip(TransactionBase):
continue
if (
(not d.additional_salary
and (not additional_salary or additional_salary.overwrite))
or (additional_salary
and additional_salary.name == d.additional_salary)
(
not d.additional_salary
and (not additional_salary or additional_salary.overwrite)
) or (
additional_salary
and additional_salary.name == d.additional_salary
)
):
component_row = d
break
@ -679,8 +682,12 @@ class SalarySlip(TransactionBase):
if additional_salary:
component_row.is_recurring_additional_salary = is_recurring
component_row.default_amount = 0
component_row.additional_amount = amount
if additional_salary.overwrite:
component_row.additional_amount = flt(flt(amount) - flt(component_row.get("default_amount", 0)),
component_row.precision("additional_amount"))
else:
component_row.default_amount = 0
component_row.additional_amount = amount
component_row.additional_salary = additional_salary.name
component_row.deduct_full_tax_on_selected_payroll_date = \
additional_salary.deduct_full_tax_on_selected_payroll_date