diff --git a/lending/loan_management/doctype/loan_demand/__init__.py b/lending/loan_management/doctype/loan_demand/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/lending/loan_management/doctype/loan_demand/loan_demand.js b/lending/loan_management/doctype/loan_demand/loan_demand.js new file mode 100644 index 00000000..4d35a48d --- /dev/null +++ b/lending/loan_management/doctype/loan_demand/loan_demand.js @@ -0,0 +1,8 @@ +// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors +// For license information, please see license.txt + +// frappe.ui.form.on("Loan Demand", { +// refresh(frm) { + +// }, +// }); diff --git a/lending/loan_management/doctype/loan_demand/loan_demand.json b/lending/loan_management/doctype/loan_demand/loan_demand.json new file mode 100644 index 00000000..b61b3731 --- /dev/null +++ b/lending/loan_management/doctype/loan_demand/loan_demand.json @@ -0,0 +1,67 @@ +{ + "actions": [], + "allow_rename": 1, + "creation": "2023-11-22 17:03:33.314004", + "doctype": "DocType", + "engine": "InnoDB", + "field_order": [ + "loan_demand_details_section", + "demand_date", + "demand_type", + "demand_sub_type", + "demand_amount" + ], + "fields": [ + { + "fieldname": "loan_demand_details_section", + "fieldtype": "Section Break", + "label": "Loan Demand Details" + }, + { + "fieldname": "demand_date", + "fieldtype": "Date", + "label": "Demand Date" + }, + { + "fieldname": "demand_type", + "fieldtype": "Select", + "label": "Demand Type", + "options": "EMI\nPenalty" + }, + { + "fieldname": "demand_sub_type", + "fieldtype": "Select", + "label": "Demand Sub Type", + "options": "Principal\nInterest\nPenal" + }, + { + "fieldname": "demand_amount", + "fieldtype": "Currency", + "label": "Demand Amount" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2023-11-22 17:07:24.843146", + "modified_by": "Administrator", + "module": "Loan Management", + "name": "Loan Demand", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "states": [] +} \ No newline at end of file diff --git a/lending/loan_management/doctype/loan_demand/loan_demand.py b/lending/loan_management/doctype/loan_demand/loan_demand.py new file mode 100644 index 00000000..7e353d07 --- /dev/null +++ b/lending/loan_management/doctype/loan_demand/loan_demand.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 LoanDemand(Document): + pass diff --git a/lending/loan_management/doctype/loan_demand/test_loan_demand.py b/lending/loan_management/doctype/loan_demand/test_loan_demand.py new file mode 100644 index 00000000..dd7b9499 --- /dev/null +++ b/lending/loan_management/doctype/loan_demand/test_loan_demand.py @@ -0,0 +1,9 @@ +# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors +# See license.txt + +# import frappe +from frappe.tests.utils import FrappeTestCase + + +class TestLoanDemand(FrappeTestCase): + pass diff --git a/lending/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.json b/lending/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.json index f795277d..b31c891e 100644 --- a/lending/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.json +++ b/lending/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.json @@ -7,6 +7,7 @@ "engine": "InnoDB", "field_order": [ "loan", + "rate_of_interest", "loan_product", "applicant_type", "applicant", @@ -14,15 +15,18 @@ "loan_account", "column_break_4", "company", + "start_date", "posting_date", "due_date", "accrual_type", + "interest_type", "is_term_loan", "is_npa", "section_break_7", "pending_principal_amount", "payable_principal_amount", "paid_principal_amount", + "additional_interest_amount", "column_break_14", "interest_amount", "total_pending_interest_amount", @@ -47,7 +51,7 @@ "fieldname": "posting_date", "fieldtype": "Date", "in_list_view": 1, - "label": "Posting Date" + "label": "Posting Date (End Date)" }, { "fieldname": "pending_principal_amount", @@ -213,13 +217,35 @@ "fieldname": "is_npa", "fieldtype": "Check", "label": "Is NPA" + }, + { + "fieldname": "start_date", + "fieldtype": "Date", + "label": "Start Date" + }, + { + "fieldname": "interest_type", + "fieldtype": "Select", + "label": "Interest Type", + "options": "Normal Interest\nPenal Interest" + }, + { + "fetch_from": "loan.rate_of_interest", + "fieldname": "rate_of_interest", + "fieldtype": "Float", + "label": "Rate Of Interest" + }, + { + "fieldname": "additional_interest_amount", + "fieldtype": "Currency", + "label": "Additional Interest Amount" } ], "in_create": 1, "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2023-10-02 22:14:24.469965", + "modified": "2023-11-22 16:57:11.982248", "modified_by": "Administrator", "module": "Loan Management", "name": "Loan Interest Accrual",