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

fix: Loan amount post write off

Browse Source
This commit is contained in:
Deepesh Garg
2022-09-13 11:53:11 +05:30
parent 2b900e2f0e
commit e78a7679a4
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/loan_management/doctype/loan/loan.json
View File

@@ -52,10 +52,10 @@
"refund_amount", "refund_amount",
"debit_adjustment_amount", "debit_adjustment_amount",
"credit_adjustment_amount", "credit_adjustment_amount",
"is_npa",
"column_break_19", "column_break_19",
"total_interest_payable", "total_interest_payable",
"total_amount_paid", "total_amount_paid",
"is_npa",
"amended_from" "amended_from"
], ],
"fields": [ "fields": [
@@ -424,7 +424,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2022-09-12 03:36:49.145014", "modified": "2022-09-13 02:05:25.017190",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Loan Management", "module": "Loan Management",
"name": "Loan", "name": "Loan",

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

@@ -1394,6 +1394,21 @@ class SalarySlip(TransactionBase):
amounts["interest_amount"] + amounts["payable_principal_amount"] amounts["interest_amount"] + amounts["payable_principal_amount"]
> amounts["written_off_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( self.append(
"loans", "loans",
{ {