From 7ed5919d5bca3b1d0eb71ab795e85b3d829ca137 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 22 Jul 2019 11:30:05 +0530 Subject: [PATCH] fix(LoanApplication): Repayment amount check (#18376) * fix: Clickable Asset link * fix(LoanApplication): Repayment amount check --- erpnext/controllers/buying_controller.py | 3 ++- erpnext/hr/doctype/loan_application/loan_application.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py index 2c46db0935..0b4d38ce5c 100644 --- a/erpnext/controllers/buying_controller.py +++ b/erpnext/controllers/buying_controller.py @@ -636,7 +636,8 @@ class BuyingController(StockController): asset.set_missing_values() asset.insert() - frappe.msgprint(_("Asset {0} created").format(asset.name)) + asset_link = frappe.utils.get_link_to_form('Asset', asset.name) + frappe.msgprint(_("Asset {0} created").format(asset_link)) return asset.name def make_asset_movement(self, row): diff --git a/erpnext/hr/doctype/loan_application/loan_application.py b/erpnext/hr/doctype/loan_application/loan_application.py index 58a362d086..28d9c43f8e 100644 --- a/erpnext/hr/doctype/loan_application/loan_application.py +++ b/erpnext/hr/doctype/loan_application/loan_application.py @@ -30,7 +30,7 @@ class LoanApplication(Document): monthly_interest_rate = flt(self.rate_of_interest) / (12 *100) if monthly_interest_rate: min_repayment_amount = self.loan_amount*monthly_interest_rate - if self.repayment_amount - min_repayment_amount < 0: + if self.repayment_amount - min_repayment_amount <= 0: frappe.throw(_("Repayment Amount must be greater than " \ + str(flt(min_repayment_amount, 2)))) self.repayment_periods = math.ceil((math.log(self.repayment_amount) -