schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #27005 from frappe/addl_salary_fix-v13

Browse Source 
fix: Additional salary processing
This commit is contained in:
Nabin Hait
2021-08-24 10:35:51 +05:30
committed by GitHub
parent 85f582b145 44919ac807
commit 352157c9fc
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -646,10 +646,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
@@ -680,8 +683,13 @@ class SalarySlip(TransactionBase):
component_row.set('abbr', abbr)
if additional_salary:
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