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

fix: Show Create Loan button only if loan is not created (#19291)

Browse Source
This commit is contained in:
Deepesh Garg
2019-10-14 15:50:19 +05:30
committed by Nabin Hait
parent 3919fd10ad
commit 675e2670b2
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/hr/doctype/loan/loan.py
View File

@@ -13,6 +13,7 @@ class Loan(AccountsController):
def validate(self): def validate(self):
validate_repayment_method(self.repayment_method, self.loan_amount, self.monthly_repayment_amount, self.repayment_periods) validate_repayment_method(self.repayment_method, self.loan_amount, self.monthly_repayment_amount, self.repayment_periods)
self.set_missing_fields() self.set_missing_fields()
self.validate_loan_application()
self.make_repayment_schedule() self.make_repayment_schedule()
self.set_repayment_period() self.set_repayment_period()
self.calculate_totals() self.calculate_totals()
@@ -33,6 +34,13 @@ class Loan(AccountsController):
if self.status == "Repaid/Closed": if self.status == "Repaid/Closed":
self.total_amount_paid = self.total_payment self.total_amount_paid = self.total_payment
def validate_loan_application(self):
if self.loan_application:
loan = frappe.db.get_value("Loan", {"loan_application": self.loan_application}, "name")
if loan and loan != self.name:
frappe.throw(_("Loan {0} already created for Loan Application {1}").format(frappe.bold(loan),
frappe.bold(self.loan_application)))
def make_jv_entry(self): def make_jv_entry(self):
self.check_permission('write') self.check_permission('write')

33
erpnext/hr/doctype/loan_application/loan_application.js
View File

@@ -23,20 +23,25 @@ frappe.ui.form.on('Loan Application', {
}, },
add_toolbar_buttons: function(frm) { add_toolbar_buttons: function(frm) {
if (frm.doc.status == "Approved") { if (frm.doc.status == "Approved") {
frm.add_custom_button(__('Create Loan'), function() { // show create loan button if loan not created against loan aplication
frappe.call({ frappe.db.get_value("Loan", {"loan_application": frm.doc.name}, "name", (r) => {
method: "erpnext.hr.doctype.loan_application.loan_application.make_loan", if (!r) {
args: { frm.add_custom_button(__('Create Loan'), function() {
"source_name": frm.doc.name frappe.call({
}, method: "erpnext.hr.doctype.loan_application.loan_application.make_loan",
callback: function(r) { args: {
if(!r.exc) { "source_name": frm.doc.name
var doc = frappe.model.sync(r.message); },
frappe.set_route("Form", r.message.doctype, r.message.name); callback: function(r) {
} if(!r.exc) {
} var doc = frappe.model.sync(r.message);
}); frappe.set_route("Form", r.message.doctype, r.message.name);
}).addClass("btn-primary"); }
}
});
}).addClass("btn-primary");
}
});
} }
} }
}); });