fix: conflicts
diff --git a/erpnext/loan_management/loan_common.js b/erpnext/loan_management/loan_common.js
new file mode 100644
index 0000000..3a47a88
--- /dev/null
+++ b/erpnext/loan_management/loan_common.js
@@ -0,0 +1,40 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on(cur_frm.doctype, {
+ refresh: function(frm) {
+ if (!frappe.boot.active_domains.includes("Non Profit")) {
+ frm.set_df_property('applicant_type', 'options', ['Employee', 'Customer']);
+ frm.refresh_field('applicant_type');
+ }
+
+ if (['Loan Disbursement', 'Loan Repayment', 'Loan Interest Accrual'].includes(frm.doc.doctype)
+ && frm.doc.docstatus == 1) {
+
+ frm.add_custom_button(__("Accounting Ledger"), function() {
+ frappe.route_options = {
+ voucher_no: frm.doc.name,
+ company: frm.doc.company
+ };
+
+ frappe.set_route("query-report", "General Ledger");
+ },__("View"));
+ }
+ },
+ applicant: function(frm) {
+ if (!["Loan Application", "Loan"].includes(frm.doc.doctype)) {
+ return;
+ }
+
+ if (frm.doc.applicant) {
+ frappe.model.with_doc(frm.doc.applicant_type, frm.doc.applicant, function() {
+ var applicant = frappe.model.get_doc(frm.doc.applicant_type, frm.doc.applicant);
+ frm.set_value("applicant_name",
+ applicant.employee_name || applicant.member_name);
+ });
+ }
+ else {
+ frm.set_value("applicant_name", null);
+ }
+ }
+});
\ No newline at end of file