Merge pull request #1205 from deepeshgarg007/customer_loan_security_ledger

feat: Customer-level loan security ledger

Author: deepeshgarg007

lending/api.py

@@ -7,6 +7,10 @@
 from frappe import _
 from frappe.utils import flt, getdate
 
+from lending.loan_management.doctype.process_loan_security_shortfall.process_loan_security_shortfall import (
+	create_process_loan_security_shortfall,
+)
+
 
 @frappe.whitelist()
 def get_repayment_schedule(loan_product: str, loan_amount: float, rate_of_interest: float, tenure: int, repayment_frequency: str | None, repayment_start_date: str | None = None) -> list[dict]:
@@ -66,6 +70,7 @@ def update_loan_security_price(data: dict):
 			"valid_upto": price_details.get("valid_upto")
 		})
 
+	create_process_loan_security_shortfall()
 	frappe.response["message"] = _("Loan Security Prices updated successfully")
 
 @frappe.whitelist()

lending/loan_management/doctype/loan_security_release/loan_security_release.json

@@ -33,6 +33,7 @@
    "fieldname": "applicant",
    "fieldtype": "Data",
    "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Applicant",
    "reqd": 1,
    "search_index": 1
@@ -44,6 +45,7 @@
   {
    "fieldname": "loan",
    "fieldtype": "Link",
+   "in_standard_filter": 1,
    "label": "Loan",
    "options": "Loan",
    "search_index": 1
@@ -126,7 +128,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2026-03-04 16:46:54.213511",
+ "modified": "2026-04-12 08:59:16.690887",
  "modified_by": "Administrator",
  "module": "Loan Management",
  "name": "Loan Security Release",

lending/loan_management/doctype/loan_security_release/loan_security_release.py

@@ -29,7 +29,7 @@ class LoanSecurityRelease(Document):
 		applicant_type: DF.Literal["Employee", "Member", "Customer"]
 		company: DF.Link
 		description: DF.Text | None
-		loan: DF.Link
+		loan: DF.Link | None
 		reference_no: DF.Data | None
 		securities: DF.Table[Unpledge]
 		status: DF.Literal["Requested", "Approved"]

lending/loan_management/report/loan_security_ledger/loan_security_ledger.js

@@ -8,7 +8,12 @@ frappe.query_reports["Loan Security Ledger"] = {
 			"label": __("Loan"),
 			"fieldtype": "Link",
 			"options": "Loan",
-			"reqd": 1,
+		},
+		{
+			"fieldname": "applicant",
+			"label": __("Applicant"),
+			"fieldtype": "Link",
+			"options": "Customer",
 		},
 		{
 			"fieldname": "loan_security",

lending/loan_management/report/loan_security_ledger/loan_security_ledger.py

@@ -3,6 +3,8 @@
 
 import frappe
 from frappe import _
+from frappe.query_builder import functions as fn
+from frappe.query_builder.custom import ConstantColumn
 
 
 def execute(filters: dict | None = None):
@@ -64,29 +66,50 @@ def get_columns(filters) -> list[dict]:
 
 def get_data(filters) -> list[list]:
 	loan = filters.get("loan")
+	applicant = filters.get("applicant")
+	loan_security = filters.get("loan_security")
+
+	if not (loan or applicant):
+		frappe.throw(_("Please select at least Loan or Applicant to view the ledger"))
+
 	balance_qty = 0
 
-	unpledges = frappe.db.sql(
-		"""
-			SELECT up.loan, "Loan Security Release" as doctype, u.loan_security, u.loan_security_type, u.qty, up.unpledge_time as date
-			FROM `tabLoan Security Release` up, `tabUnpledge` u
-			WHERE up.loan = %s
-			AND u.parent = up.name
-			AND up.status = 'Approved'
-			GROUP BY u.loan_security
-		""", (loan), as_dict=1
-	)
-
-	pledges = frappe.db.sql(
-		"""
-			SELECT lsa.loan, "Loan Security Assignment" as doctype, p.loan_security, p.loan_security_type, p.qty, lsa.pledge_time as date
-			FROM `tabLoan Security Assignment` lsa, `tabPledge` p
-			WHERE lsa.loan = %s
-			AND p.parent = lsa.name
-			AND lsa.status = 'Pledged'
-			GROUP BY p.loan_security
-		""", (loan), as_dict=1
-	)
+	unpldge_doctype = frappe.qb.DocType("Unpledge")
+	loan_security_release_doctype = frappe.qb.DocType("Loan Security Release")
+
+	pledge_doctype = frappe.qb.DocType("Pledge")
+	loan_security_assignment_doctype = frappe.qb.DocType("Loan Security Assignment")
+
+	unpledge_query = frappe.qb.from_(unpldge_doctype).inner_join(loan_security_release_doctype).on(
+		unpldge_doctype.parent == loan_security_release_doctype.name
+	).select(
+		loan_security_release_doctype.loan, ConstantColumn("Loan Security Release").as_("doctype"), unpldge_doctype.loan_security, fn.Sum(unpldge_doctype.qty).as_("qty"), loan_security_release_doctype.unpledge_time.as_("date"), unpldge_doctype.loan_security_type
+	).where(loan_security_release_doctype.docstatus == 1).where(loan_security_release_doctype.status == "Approved")
+
+	pledge_query = frappe.qb.from_(pledge_doctype).inner_join(loan_security_assignment_doctype).on(
+		pledge_doctype.parent == loan_security_assignment_doctype.name
+	).select(
+		loan_security_assignment_doctype.loan, ConstantColumn("Loan Security Assignment").as_("doctype"), pledge_doctype.loan_security, fn.Sum(pledge_doctype.qty).as_("qty"), loan_security_assignment_doctype.pledge_time.as_("date"), pledge_doctype.loan_security_type
+	).where(loan_security_assignment_doctype.docstatus == 1).where(loan_security_assignment_doctype.status == "Pledged")
+
+	if loan:
+		unpledge_query = unpledge_query.where(loan_security_release_doctype.loan == loan)
+		pledge_query = pledge_query.where(loan_security_assignment_doctype.loan == loan)
+
+	if applicant:
+		unpledge_query = unpledge_query.where(loan_security_release_doctype.applicant == applicant)
+		pledge_query = pledge_query.where(loan_security_assignment_doctype.applicant == applicant)
+
+	if loan_security:
+		unpledge_query = unpledge_query.where(unpldge_doctype.loan_security == loan_security)
+		pledge_query = pledge_query.where(pledge_doctype.loan_security == loan_security)
+
+	if loan_security:
+		unpledge_query = unpledge_query.where(unpldge_doctype.loan_security == loan_security)
+		pledge_query = pledge_query.where(pledge_doctype.loan_security == loan_security)
+
+	unpledges = unpledge_query.groupby(unpldge_doctype.loan_security).run(as_dict=True)
+	pledges = pledge_query.groupby(pledge_doctype.loan_security).run(as_dict=True)
 
 	result = pledges + unpledges