nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-31 23:33:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Resolved merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2021-04-14 13:09:50 +05:30
parent 3f6ba12344 b77793763a
commit 2535fe9b1e
9 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -633,8 +633,6 @@ 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: