diff --git a/erpnext/loan_management/doctype/loan/loan.json b/erpnext/loan_management/doctype/loan/loan.json index b0edfcfece0..76870aeee89 100644 --- a/erpnext/loan_management/doctype/loan/loan.json +++ b/erpnext/loan_management/doctype/loan/loan.json @@ -52,10 +52,10 @@ "refund_amount", "debit_adjustment_amount", "credit_adjustment_amount", - "is_npa", "column_break_19", "total_interest_payable", "total_amount_paid", + "is_npa", "amended_from" ], "fields": [ @@ -424,7 +424,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2022-09-12 03:36:49.145014", + "modified": "2022-09-13 02:05:25.017190", "modified_by": "Administrator", "module": "Loan Management", "name": "Loan", diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py index f616aecedaf..d7ed5a8e36b 100644 --- a/erpnext/payroll/doctype/salary_slip/salary_slip.py +++ b/erpnext/payroll/doctype/salary_slip/salary_slip.py @@ -1394,6 +1394,21 @@ class SalarySlip(TransactionBase): amounts["interest_amount"] + amounts["payable_principal_amount"] > amounts["written_off_amount"] ): + print(amounts["written_off_amount"], "###########") + if amounts["interest_amount"] > amounts["written_off_amount"]: + amounts["interest_amount"] -= amounts["written_off_amount"] + amounts["written_off_amount"] = 0 + else: + amounts["written_off_amount"] -= amounts["interest_amount"] + amounts["interest_amount"] = 0 + + if amounts["payable_principal_amount"] > amounts["written_off_amount"]: + amounts["payable_principal_amount"] -= amounts["written_off_amount"] + amounts["written_off_amount"] = 0 + else: + amounts["written_off_amount"] -= amounts["payable_principal_amount"] + amounts["payable_principal_amount"] = 0 + self.append( "loans", {