nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-29 19:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Update labels as per repayment type

Browse Source 
(cherry picked from commit 2ddee50f27)

# Conflicts:
#	erpnext/loan_management/doctype/loan/loan.json
This commit is contained in:
Deepesh Garg
2022-09-30 10:39:45 +05:30
committed by Mergify
parent 71b21086b1
commit 3f02059085
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/loan_management/doctype/loan/loan.js
View File

@@ -103,6 +103,14 @@ frappe.ui.form.on('Loan', {
frm.trigger("toggle_fields");
},
repayment_schedule_type: function(frm) {
if (frm.doc.repayment_schedule_type == "Pro-rated calendar months") {
frm.set_df_property("repayment_start_date", "label", "Interest Calculation Start Date");
} else {
frm.set_df_property("repayment_start_date", "label", "Repayment Start Date");
}
},
loan_type: function(frm) {
frm.toggle_reqd("repayment_method", frm.doc.is_term_loan);
frm.toggle_display("repayment_method", frm.doc.is_term_loan);

17
erpnext/loan_management/doctype/loan/loan.json
View File

@@ -20,6 +20,7 @@
"manually_update_paid_amount_in_salary_slip",
"section_break_8",
"loan_type",
"repayment_schedule_type",
"loan_amount",
"rate_of_interest",
"is_secured_loan",
@@ -167,7 +168,8 @@
"depends_on": "is_term_loan",
"fieldname": "repayment_start_date",
"fieldtype": "Date",
"label": "Repayment Start Date"
"label": "Repayment Start Date",
"mandatory_depends_on": "is_term_loan"
},
{
"fieldname": "column_break_11",
@@ -413,22 +415,35 @@
"label": "Is NPA"
},
{
<<<<<<< HEAD
"allow_on_submit": 1,
"default": "0",
"depends_on": "repay_from_salary",
"fieldname": "manually_update_paid_amount_in_salary_slip",
"fieldtype": "Check",
"label": "Manually Update Paid Amount in Salary Slip"
=======
"depends_on": "is_term_loan",
"fetch_from": "loan_type.repayment_schedule_type",
"fieldname": "repayment_schedule_type",
"fieldtype": "Data",
"label": "Repayment Schedule Type",
"read_only": 1
>>>>>>> 2ddee50f27 (chore: Update labels as per repayment type)
}
],
"index_web_pages_for_search": 1,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2022-09-13 02:05:25.017190",
=======
"modified": "2022-09-29 11:50:31.957360",
>>>>>>> 76c6ccab5d (feat: Repayment schedule types for term loans)
=======
"modified": "2022-09-30 10:36:47.902903",
>>>>>>> 2ddee50f27 (chore: Update labels as per repayment type)
"modified_by": "Administrator",
"module": "Loan Management",
"name": "Loan",