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

Merge pull request #24879 from deepeshgarg007/loan_fixes_phase_2

Browse Source 
fix: Loan Repayment entry cancellation on salary slip cancel
This commit is contained in:
Deepesh Garg 2021-04-07 10:33:46 +05:30 committed by GitHub
commit 3d5a4ffd66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
View File

@ -21,6 +21,7 @@ class LoanRepayment(AccountsController):
def validate(self): def validate(self):
amounts = calculate_amounts(self.against_loan, self.posting_date) amounts = calculate_amounts(self.against_loan, self.posting_date)
self.set_missing_values(amounts) self.set_missing_values(amounts)
self.check_future_entries()
self.validate_amount() self.validate_amount()
self.allocate_amounts(amounts) self.allocate_amounts(amounts)
@ -69,6 +70,13 @@ class LoanRepayment(AccountsController):
if amounts.get('due_date'): if amounts.get('due_date'):
self.due_date = amounts.get('due_date') self.due_date = amounts.get('due_date')
def check_future_entries(self):
future_repayment_date = frappe.db.get_value("Loan Repayment", {"posting_date": (">", self.posting_date),
"docstatus": 1, "against_loan": self.against_loan}, 'posting_date')
if future_repayment_date:
frappe.throw("Repayment already made till date {0}".format(getdate(future_repayment_date)))
def validate_amount(self): def validate_amount(self):
precision = cint(frappe.db.get_default("currency_precision")) or 2 precision = cint(frappe.db.get_default("currency_precision")) or 2
@ -307,7 +315,9 @@ def create_repayment_entry(loan, applicant, company, posting_date, loan_type,
return lr return lr
def get_accrued_interest_entries(against_loan): def get_accrued_interest_entries(against_loan, posting_date=None):
if not posting_date:
posting_date = getdate()
unpaid_accrued_entries = frappe.db.sql( unpaid_accrued_entries = frappe.db.sql(
""" """
@ -318,12 +328,13 @@ def get_accrued_interest_entries(against_loan):
`tabLoan Interest Accrual` `tabLoan Interest Accrual`
WHERE WHERE
loan = %s loan = %s
AND posting_date <= %s
AND (interest_amount - paid_interest_amount > 0 OR AND (interest_amount - paid_interest_amount > 0 OR
payable_principal_amount - paid_principal_amount > 0) payable_principal_amount - paid_principal_amount > 0)
AND AND
docstatus = 1 docstatus = 1
ORDER BY posting_date ORDER BY posting_date
""", (against_loan), as_dict=1) """, (against_loan, posting_date), as_dict=1)
return unpaid_accrued_entries return unpaid_accrued_entries
@ -335,7 +346,7 @@ def get_amounts(amounts, against_loan, posting_date):
against_loan_doc = frappe.get_doc("Loan", against_loan) against_loan_doc = frappe.get_doc("Loan", against_loan)
loan_type_details = frappe.get_doc("Loan Type", against_loan_doc.loan_type) loan_type_details = frappe.get_doc("Loan Type", against_loan_doc.loan_type)
accrued_interest_entries = get_accrued_interest_entries(against_loan_doc.name) accrued_interest_entries = get_accrued_interest_entries(against_loan_doc.name, posting_date)
pending_accrual_entries = {} pending_accrual_entries = {}

5
erpnext/loan_management/doctype/salary_slip_loan/salary_slip_loan.json
View File

@ -70,7 +70,9 @@
{ {
"fieldname": "loan_repayment_entry", "fieldname": "loan_repayment_entry",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 1,
"label": "Loan Repayment Entry", "label": "Loan Repayment Entry",
"no_copy": 1,
"options": "Loan Repayment", "options": "Loan Repayment",
"read_only": 1 "read_only": 1
}, },
@ -83,9 +85,10 @@
"read_only": 1 "read_only": 1
} }
], ],
"index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
"modified": "2020-04-16 13:17:04.798335", "modified": "2021-03-14 20:47:11.725818",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Loan Management", "module": "Loan Management",
"name": "Salary Slip Loan", "name": "Salary Slip Loan",

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

@ -1053,7 +1053,7 @@ class SalarySlip(TransactionBase):
repayment_entry.save() repayment_entry.save()
repayment_entry.submit() repayment_entry.submit()
loan.loan_repayment_entry = repayment_entry.name frappe.db.set_value("Salary Slip Loan", loan.name, "loan_repayment_entry", repayment_entry.name)
def cancel_loan_repayment_entry(self): def cancel_loan_repayment_entry(self):
for loan in self.loans: for loan in self.loans: