Merge pull request #26252 from deepeshgarg007/loan_security_pledge_on…

…_cancel

fix: Cancellation of Loan Security Pledges

erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.json

@@ -35,7 +35,9 @@
  "no_copy": 1,
  "options": "Loan Security Pledge",
  "print_hide": 1,
- "read_only": 1
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fetch_from": "loan_application.applicant",
@@ -45,47 +47,63 @@
  "in_standard_filter": 1,
  "label": "Applicant",
  "options": "applicant_type",
- "reqd": 1
+ "reqd": 1,
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "loan_security_details_section",
  "fieldtype": "Section Break",
- "label": "Loan Security Details"
+ "label": "Loan Security Details",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "column_break_3",
- "fieldtype": "Column Break"
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "loan",
  "fieldtype": "Link",
  "label": "Loan",
- "options": "Loan"
+ "options": "Loan",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "loan_application",
  "fieldtype": "Link",
  "label": "Loan Application",
- "options": "Loan Application"
+ "options": "Loan Application",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "total_security_value",
  "fieldtype": "Currency",
  "label": "Total Security Value",
  "options": "Company:company:default_currency",
- "read_only": 1
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "maximum_loan_value",
  "fieldtype": "Currency",
  "label": "Maximum Loan Value",
  "options": "Company:company:default_currency",
- "read_only": 1
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "loan_details_section",
  "fieldtype": "Section Break",
- "label": "Loan Details"
+ "label": "Loan Details",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "default": "Requested",
@@ -94,73 +112,95 @@
  "in_list_view": 1,
  "in_standard_filter": 1,
  "label": "Status",
- "options": "Requested\nUnpledged\nPledged\nPartially Pledged",
- "read_only": 1
+ "options": "Requested\nUnpledged\nPledged\nPartially Pledged\nCancelled",
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "pledge_time",
  "fieldtype": "Datetime",
  "label": "Pledge Time",
- "read_only": 1
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "securities",
  "fieldtype": "Table",
  "label": "Securities",
  "options": "Pledge",
- "reqd": 1
+ "reqd": 1,
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "column_break_11",
- "fieldtype": "Column Break"
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "section_break_10",
  "fieldtype": "Section Break",
- "label": "Totals"
+ "label": "Totals",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "company",
  "fieldtype": "Link",
  "label": "Company",
  "options": "Company",
- "reqd": 1
+ "reqd": 1,
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fetch_from": "loan.applicant_type",
  "fieldname": "applicant_type",
  "fieldtype": "Select",
  "label": "Applicant Type",
  "options": "Employee\nMember\nCustomer",
- "reqd": 1
+ "reqd": 1,
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "collapsible": 1,
  "fieldname": "more_information_section",
  "fieldtype": "Section Break",
- "label": "More Information"
+ "label": "More Information",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "allow_on_submit": 1,
  "fieldname": "reference_no",
  "fieldtype": "Data",
- "label": "Reference No"
+ "label": "Reference No",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "fieldname": "column_break_18",
- "fieldtype": "Column Break"
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
  },
  {
  "allow_on_submit": 1,
  "fieldname": "description",
  "fieldtype": "Text",
- "label": "Description"
+ "label": "Description",
+ "show_days": 1,
+ "show_seconds": 1
  }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2021-04-19 18:23:16.953305",
+ "modified": "2021-06-29 17:15:16.082256",
  "modified_by": "Administrator",
  "module": "Loan Management",
  "name": "Loan Security Pledge",

erpnext/loan_management/doctype/loan_security_pledge/loan_security_pledge.py

@@ -23,6 +23,12 @@ def on_submit(self):
  update_shortfall_status(self.loan, self.total_security_value)
  update_loan(self.loan, self.maximum_loan_value)
 
+ def on_cancel(self):
+ if self.loan:
+ self.db_set("status", "Cancelled")
+ self.db_set("pledge_time", None)
+ update_loan(self.loan, self.maximum_loan_value, cancel=1)
+
  def validate_duplicate_securities(self):
  security_list = []
  for security in self.securities:
@@ -36,7 +42,7 @@ def validate_loan_security_type(self):
  existing_pledge = ''
 
  if self.loan:
- existing_pledge = frappe.db.get_value('Loan Security Pledge', {'loan': self.loan}, ['name'])
+ existing_pledge = frappe.db.get_value('Loan Security Pledge', {'loan': self.loan, 'docstatus': 1}, ['name'])
 
  if existing_pledge:
  loan_security_type = frappe.db.get_value('Pledge', {'parent': existing_pledge}, ['loan_security_type'])
@@ -77,8 +83,12 @@ def set_pledge_amount(self):
  self.total_security_value = total_security_value
  self.maximum_loan_value = maximum_loan_value
 
-def update_loan(loan, maximum_value_against_pledge):
+def update_loan(loan, maximum_value_against_pledge, cancel=0):
  maximum_loan_value = frappe.db.get_value('Loan', {'name': loan}, ['maximum_loan_amount'])
 
- frappe.db.sql(""" UPDATE `tabLoan` SET maximum_loan_amount=%s, is_secured_loan=1
- WHERE name=%s""", (maximum_loan_value + maximum_value_against_pledge, loan))
+ if cancel:
+ frappe.db.sql(""" UPDATE `tabLoan` SET maximum_loan_amount=%s
+ WHERE name=%s""", (maximum_loan_value - maximum_value_against_pledge, loan))
+ else:
+ frappe.db.sql(""" UPDATE `tabLoan` SET maximum_loan_amount=%s, is_secured_loan=1
+ WHERE name=%s""", (maximum_loan_value + maximum_value_against_pledge, loan))