feat: one security to many loans

lending/loan_management/dashboard_chart_source/top_10_pledged_loan_securities/top_10_pledged_loan_securities.py

@@ -47,7 +47,7 @@ def get_data(
 		frappe.db.sql(
 			"""
 		SELECT u.loan_security, sum(u.qty) as qty
-		FROM `tabLoan Security Unpledge` up, `tabUnpledge` u
+		FROM `tabLoan Security Release` up, `tabUnpledge` u
 		WHERE u.parent = up.name
 		AND up.status = 'Approved'
 		{conditions}
@@ -64,9 +64,9 @@ def get_data(
 		frappe.db.sql(
 			"""
 		SELECT p.loan_security, sum(p.qty) as qty
-		FROM `tabLoan Security Pledge` lp, `tabPledge`p
+		FROM `tabLoan Security Assignment` lp, `tabPledge`p
 		WHERE p.parent = lp.name
-		AND lp.status = 'Pledged'
+		AND lp.status = 'Assigned'
 		{conditions}
 		GROUP BY p.loan_security
 	""".format(

lending/loan_management/doctype/loan/loan.js

@@ -7,13 +7,13 @@ frappe.ui.form.on('Loan', {
 	setup: function(frm) {
 		frm.make_methods = {
 			'Loan Disbursement': function() { frm.trigger('make_loan_disbursement') },
-			'Loan Security Unpledge': function() { frm.trigger('create_loan_security_unpledge') },
+			'Loan Security Release': function() { frm.trigger('create_loan_security_release') },
 			'Loan Write Off': function() { frm.trigger('make_loan_write_off_entry') }
 		}
 	},
 	onload: function (frm) {
-		// Ignore loan security pledge on cancel of loan
-		frm.ignore_doctypes_on_cancel_all = ["Loan Security Pledge", "Loan Repayment Schedule"];
+		// Ignore Loan Security Assignment on cancel of loan
+		frm.ignore_doctypes_on_cancel_all = ["Loan Security Assignment", "Loan Repayment Schedule"];
 
 		frm.set_query("loan_application", function () {
 			return {
@@ -82,8 +82,8 @@ frappe.ui.form.on('Loan', {
 			}
 
 			if (frm.doc.status == "Loan Closure Requested") {
-				frm.add_custom_button(__('Loan Security Unpledge'), function() {
-					frm.trigger("create_loan_security_unpledge");
+				frm.add_custom_button(__('Loan Security Release'), function() {
+					frm.trigger("create_loan_security_release");
 				},__('Create'));
 			}
 
@@ -219,7 +219,7 @@ frappe.ui.form.on('Loan', {
 		);
 	},
 
-	create_loan_security_unpledge: function(frm) {
+	create_loan_security_release: function(frm) {
 		frappe.call({
 			method: "lending.loan_management.doctype.loan.loan.unpledge_security",
 			args : {

lending/loan_management/doctype/loan/loan.py

@@ -7,6 +7,7 @@
 import frappe
 from frappe import _
 from frappe.query_builder import Order
+from frappe.query_builder.functions import Sum
 from frappe.utils import (
 	add_days,
 	cint,
@@ -22,7 +23,7 @@
 from erpnext.accounts.doctype.journal_entry.journal_entry import get_payment_entry
 from erpnext.controllers.accounts_controller import AccountsController
 
-from lending.loan_management.doctype.loan_security_unpledge.loan_security_unpledge import (
+from lending.loan_management.doctype.loan_security_release.loan_security_release import (
 	get_pledged_security_qty,
 )
 
@@ -90,13 +91,13 @@ def set_cyclic_date(self):
 			self.repayment_start_date = cyclic_date
 
 	def on_submit(self):
-		self.link_loan_security_pledge()
+		self.link_loan_security_assignment()
 		# Interest accrual for backdated term loans
 		self.accrue_loan_interest()
 		self.submit_draft_schedule()
 
 	def on_cancel(self):
-		self.unlink_loan_security_pledge()
+		self.unlink_loan_security_assignment()
 		self.cancel_and_delete_repayment_schedule()
 		self.ignore_linked_doctypes = ["GL Entry", "Payment Ledger Entry"]
 
@@ -221,25 +222,35 @@ def validate_loan_amount(self):
 		if not self.loan_amount:
 			frappe.throw(_("Loan amount is mandatory"))
 
-	def link_loan_security_pledge(self):
-		if self.is_secured_loan and self.loan_application:
-			maximum_loan_value = frappe.db.get_value(
-				"Loan Security Pledge",
-				{"loan_application": self.loan_application, "status": "Requested"},
-				"sum(maximum_loan_value)",
-			)
+	def link_loan_security_assignment(self):
+		if not self.is_secured_loan or not self.loan_application:
+			return
 
-			if maximum_loan_value:
-				frappe.db.sql(
-					"""
-					UPDATE `tabLoan Security Pledge`
-					SET loan = %s, pledge_time = %s, status = 'Pledged'
-					WHERE status = 'Requested' and loan_application = %s
-				""",
-					(self.name, now_datetime(), self.loan_application),
-				)
+		lsa = frappe.qb.DocType("Loan Security Assignment")
+		lsald = frappe.qb.DocType("Loan Security Assignment Loan Detail")
+
+		lsa_and_maximum_loan_value = (
+			frappe.qb.from_(lsa)
+			.inner_join(lsald)
+			.on(lsald.parent == lsa.name)
+			.select(lsa.name, Sum(lsa.maximum_loan_value))
+			.where(lsa.status == "Assignment Requested")
+			.where(lsald.loan_application == self.loan_application)
+		).run()
 
-				self.db_set("maximum_loan_amount", maximum_loan_value)
+		if not lsa_and_maximum_loan_value:
+			return
+
+		lsa = frappe.get_doc("Loan Security Assignment", lsa_and_maximum_loan_value[0][0])
+		for row in lsa.allocated_loans:
+			if row.loan_application == self.loan_application:
+				row.loan = self.name
+				break
+		lsa.pledge_time = now_datetime()
+		lsa.status = "Assigned"
+		lsa.save()
+
+		self.db_set("maximum_loan_amount", lsa_and_maximum_loan_value[0][1])
 
 	def accrue_loan_interest(self):
 		from lending.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
@@ -251,13 +262,15 @@ def accrue_loan_interest(self):
 				posting_date=getdate(), loan_product=self.loan_product, loan=self.name
 			)
 
-	def unlink_loan_security_pledge(self):
-		pledges = frappe.get_all("Loan Security Pledge", fields=["name"], filters={"loan": self.name})
+	def unlink_loan_security_assignment(self):
+		pledges = frappe.get_all(
+			"Loan Security Assignment", fields=["name"], filters={"loan": self.name}
+		)
 		pledge_list = [d.name for d in pledges]
 		if pledge_list:
 			frappe.db.sql(
-				"""UPDATE `tabLoan Security Pledge` SET
-				loan = '', status = 'Unpledged'
+				"""UPDATE `tabLoan Security Assignment` SET
+				loan = '', status = 'Unassigned'
 				where name in (%s) """
 				% (", ".join(["%s"] * len(pledge_list))),
 				tuple(pledge_list),
@@ -453,7 +466,13 @@ def make_loan_write_off(loan, company=None, posting_date=None, amount=0, as_dict
 
 @frappe.whitelist()
 def unpledge_security(
-	loan=None, loan_security_pledge=None, security_map=None, as_dict=0, save=0, submit=0, approve=0
+	loan=None,
+	loan_security_assignment=None,
+	security_map=None,
+	as_dict=0,
+	save=0,
+	submit=0,
+	approve=0,
 ):
 	# if no security_map is passed it will be considered as full unpledge
 	if security_map and isinstance(security_map, str):
@@ -462,17 +481,17 @@ def unpledge_security(
 	if loan:
 		pledge_qty_map = security_map or get_pledged_security_qty(loan)
 		loan_doc = frappe.get_doc("Loan", loan)
-		unpledge_request = create_loan_security_unpledge(
+		unpledge_request = create_loan_security_release(
 			pledge_qty_map, loan_doc.name, loan_doc.company, loan_doc.applicant_type, loan_doc.applicant
 		)
-	# will unpledge qty based on loan security pledge
-	elif loan_security_pledge:
+	# will unpledge qty based on Loan Security Assignment
+	elif loan_security_assignment:
 		security_map = {}
-		pledge_doc = frappe.get_doc("Loan Security Pledge", loan_security_pledge)
+		pledge_doc = frappe.get_doc("Loan Security Assignment", loan_security_assignment)
 		for security in pledge_doc.securities:
 			security_map.setdefault(security.loan_security, security.qty)
 
-		unpledge_request = create_loan_security_unpledge(
+		unpledge_request = create_loan_security_release(
 			security_map,
 			pledge_doc.loan,
 			pledge_doc.company,
@@ -499,8 +518,8 @@ def unpledge_security(
 		return unpledge_request
 
 
-def create_loan_security_unpledge(unpledge_map, loan, company, applicant_type, applicant):
-	unpledge_request = frappe.new_doc("Loan Security Unpledge")
+def create_loan_security_release(unpledge_map, loan, company, applicant_type, applicant):
+	unpledge_request = frappe.new_doc("Loan Security Release")
 	unpledge_request.applicant_type = applicant_type
 	unpledge_request.applicant = applicant
 	unpledge_request.loan = loan

lending/loan_management/doctype/loan/loan_dashboard.py

@@ -10,12 +10,12 @@ def get_data():
 			{
 				"items": [
 					"Loan Repayment Schedule",
-					"Loan Security Pledge",
+					"Loan Security Assignment",
 					"Loan Security Shortfall",
 					"Loan Disbursement",
 				]
 			},
 			{"items": ["Loan Repayment", "Loan Interest Accrual", "Loan Write Off", "Loan Restructure"]},
-			{"items": ["Loan Security Unpledge", "Days Past Due Log", "Journal Entry", "Sales Invoice"]},
+			{"items": ["Loan Security Release", "Days Past Due Log", "Journal Entry", "Sales Invoice"]},
 		],
 	}