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

Merge branch 'develop' into fix_shipment_pickup_to

Browse Source
This commit is contained in:
Ankush Menat 2021-04-15 21:01:52 +05:30 committed by GitHub
commit 5207edc188
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -633,6 +633,8 @@ class SalarySlip(TransactionBase):
if additional_salary:
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
else: