Merge pull request #109 from frappe/mergify/copy/poc-staging/pr-108

feat: Assign multiple securities to one loan (#108)

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_unpledge') },
 			'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"];
+		frm.ignore_doctypes_on_cancel_all = ["Loan Security Assignment", "Loan Repayment Schedule"];
 
 		frm.set_query("loan_application", function () {
 			return {
@@ -82,7 +82,7 @@ frappe.ui.form.on('Loan', {
 			}
 
 			if (frm.doc.status == "Loan Closure Requested") {
-				frm.add_custom_button(__('Loan Security Unpledge'), function() {
+				frm.add_custom_button(__('Loan Security Release'), function() {
 					frm.trigger("create_loan_security_unpledge");
 				},__('Create'));
 			}

lending/loan_management/doctype/loan/loan.py

@@ -22,7 +22,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,
 )
 
@@ -244,7 +244,7 @@ def validate_loan_amount(self):
 	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 Security Assignment",
 				{"loan_application": self.loan_application, "status": "Requested"},
 				"sum(maximum_loan_value)",
 			)
@@ -272,7 +272,9 @@ def accrue_loan_interest(self):
 			)
 
 	def unlink_loan_security_pledge(self):
-		pledges = frappe.get_all("Loan Security Pledge", fields=["name"], filters={"loan": self.name})
+		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(
@@ -513,7 +515,7 @@ def unpledge_security(
 	# will unpledge qty based on loan security pledge
 	elif loan_security_pledge:
 		security_map = {}
-		pledge_doc = frappe.get_doc("Loan Security Pledge", loan_security_pledge)
+		pledge_doc = frappe.get_doc("Loan Security Assignment", loan_security_pledge)
 		for security in pledge_doc.securities:
 			security_map.setdefault(security.loan_security, security.qty)
 
@@ -545,7 +547,7 @@ def unpledge_security(
 
 
 def create_loan_security_unpledge(unpledge_map, loan, company, applicant_type, applicant):
-	unpledge_request = frappe.new_doc("Loan Security Unpledge")
+	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"]},
 		],
 	}

lending/loan_management/doctype/loan/test_loan.py

@@ -31,7 +31,7 @@
 	days_in_year,
 )
 from lending.loan_management.doctype.loan_repayment.loan_repayment import calculate_amounts
-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,
 )
 from lending.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
@@ -1146,7 +1146,7 @@ def create_loan_security():
 
 def create_loan_security_pledge(applicant, pledges, loan_application=None, loan=None):
 
-	lsp = frappe.new_doc("Loan Security Pledge")
+	lsp = frappe.new_doc("Loan Security Assignment")
 	lsp.applicant_type = "Customer"
 	lsp.applicant = applicant
 	lsp.company = "_Test Company"

lending/loan_management/doctype/loan_application/loan_application.js

@@ -8,7 +8,7 @@ frappe.ui.form.on('Loan Application', {
 	setup: function(frm) {
 		frm.make_methods = {
 			'Loan': function() { frm.trigger('create_loan') },
-			'Loan Security Pledge': function() { frm.trigger('create_loan_security_pledge') },
+			'Loan Security Assignment': function() { frm.trigger('create_loan_security_pledge') },
 		}
 	},
 	refresh: function(frm) {
@@ -39,9 +39,9 @@ frappe.ui.form.on('Loan Application', {
 		if (frm.doc.status == "Approved") {
 
 			if (frm.doc.is_secured_loan) {
-				frappe.db.get_value("Loan Security Pledge", {"loan_application": frm.doc.name, "docstatus": 1}, "name", (r) => {
+				frappe.db.get_value("Loan Security Assignment", {"loan_application": frm.doc.name, "docstatus": 1}, "name", (r) => {
 					if (Object.keys(r).length === 0) {
-						frm.add_custom_button(__('Loan Security Pledge'), function() {
+						frm.add_custom_button(__('Loan Security Assignment'), function() {
 							frm.trigger('create_loan_security_pledge');
 						},__('Create'))
 					}
@@ -72,7 +72,7 @@ frappe.ui.form.on('Loan Application', {
 	create_loan_security_pledge: function(frm) {
 
 		if(!frm.doc.is_secured_loan) {
-			frappe.throw(__("Loan Security Pledge can only be created for secured loans"));
+			frappe.throw(__("Loan Security Assignment can only be created for secured loans"));
 		}
 
 		frappe.call({
@@ -81,7 +81,7 @@ frappe.ui.form.on('Loan Application', {
 				loan_application: frm.doc.name
 			},
 			callback: function(r) {
-				frappe.set_route("Form", "Loan Security Pledge", r.message);
+				frappe.set_route("Form", "Loan Security Assignment", r.message);
 			}
 		})
 	},

lending/loan_management/doctype/loan_application/loan_application.py

@@ -203,7 +203,7 @@ def update_accounts(source_doc, target_doc, source_parent):
 def create_pledge(loan_application, loan=None):
 	loan_application_doc = frappe.get_doc("Loan Application", loan_application)
 
-	lsp = frappe.new_doc("Loan Security Pledge")
+	lsp = frappe.new_doc("Loan Security Assignment")
 	lsp.applicant_type = loan_application_doc.applicant_type
 	lsp.applicant = loan_application_doc.applicant
 	lsp.loan_application = loan_application_doc.name
@@ -227,7 +227,7 @@ def create_pledge(loan_application, loan=None):
 	lsp.save()
 	lsp.submit()
 
-	message = _("Loan Security Pledge Created : {0}").format(lsp.name)
+	message = _("Loan Security Assignment Created : {0}").format(lsp.name)
 	frappe.msgprint(message)
 
 	return lsp.name

lending/loan_management/doctype/loan_application/loan_application_dashboard.py

@@ -2,6 +2,6 @@ def get_data():
 	return {
 		"fieldname": "loan_application",
 		"transactions": [
-			{"items": ["Loan", "Loan Security Pledge"]},
+			{"items": ["Loan", "Loan Security Assignment"]},
 		],
 	}

lending/loan_management/doctype/loan_assignment_detail/loan_assignment_detail.json

@@ -0,0 +1,53 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2023-10-19 16:26:54.924575",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "loan",
+  "loan_application",
+  "loan_amount",
+  "pending_principal_amount"
+ ],
+ "fields": [
+  {
+   "fieldname": "loan",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Loan",
+   "options": "Loan"
+  },
+  {
+   "fieldname": "loan_application",
+   "fieldtype": "Link",
+   "label": "Loan Application",
+   "options": "Loan Application"
+  },
+  {
+   "fetch_from": "loan.loan_amount",
+   "fieldname": "loan_amount",
+   "fieldtype": "Currency",
+   "label": "Loan Amount"
+  },
+  {
+   "fieldname": "pending_principal_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Pending Principal Amount"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2023-10-19 17:24:13.961740",
+ "modified_by": "Administrator",
+ "module": "Loan Management",
+ "name": "Loan Assignment Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}

lending/loan_management/doctype/loan_assignment_detail/loan_assignment_detail.py

@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class LoanAssignmentDetail(Document):
+	pass

lending/loan_management/doctype/loan_disbursement/loan_disbursement.py

@@ -10,7 +10,7 @@
 from erpnext.accounts.general_ledger import make_gl_entries
 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,
 )
 from lending.loan_management.doctype.process_loan_interest_accrual.process_loan_interest_accrual import (
@@ -376,4 +376,6 @@ def get_disbursal_amount(loan, on_current_security_price=0):
 
 
 def get_maximum_amount_as_per_pledged_security(loan):
-	return flt(frappe.db.get_value("Loan Security Pledge", {"loan": loan}, "sum(maximum_loan_value)"))
+	return flt(
+		frappe.db.get_value("Loan Security Assignment", {"loan": loan}, "sum(maximum_loan_value)")
+	)

lending/loan_management/doctype/loan_repayment/loan_repayment.py

@@ -1073,7 +1073,7 @@ def get_pending_principal_amount(loan):
 		)
 	else:
 		pending_principal_amount = (
-			flt(loan.disbursed_amount)
+			flt(loan.disbursed_amount or loan.loan_amount)
 			+ flt(loan.debit_adjustment_amount)
 			- flt(loan.credit_adjustment_amount)
 			- flt(loan.total_principal_paid)

lending/loan_management/doctype/loan_security/loan_security_dashboard.py

@@ -3,6 +3,6 @@ def get_data():
 		"fieldname": "loan_security",
 		"transactions": [
 			{"items": ["Loan Application", "Loan Security Price"]},
-			{"items": ["Loan Security Pledge", "Loan Security Unpledge"]},
+			{"items": ["Loan Security Assignment", "Loan Security Release"]},
 		],
 	}

lending/loan_management/doctype/loan_security_pledge/loan_security_pledge.js → lending/loan_management/doctype/loan_security_assignment/loan_security_assignment.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2019, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on('Loan Security Pledge', {
+frappe.ui.form.on('Loan Security Assignment', {
 	calculate_amounts: function(frm, cdt, cdn) {
 		let row = locals[cdt][cdn];
 		frappe.model.set_value(cdt, cdn, 'amount', row.qty * row.loan_security_price);