pricing rule fix
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 967f23c..b913b6b 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -201,6 +201,8 @@
item_details.margin_rate_or_amount = 0.0
item_details.margin_type = None
+ if item_details.pricing_rule:
+ item_details.pricing_rule = None
return item_details
@frappe.whitelist()
diff --git a/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py b/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py
index 74a65e2..357571e 100644
--- a/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py
+++ b/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py
@@ -28,8 +28,12 @@
if self.repayment_method == "Repay Fixed Amount per Period":
monthly_interest_rate = flt(self.rate_of_interest) / (12 *100)
- self.repayment_periods = math.ceil((math.log(self.repayment_amount) - math.log(self.repayment_amount - \
- (self.loan_amount*monthly_interest_rate)))/(math.log(1+monthly_interest_rate)))
+ if monthly_interest_rate:
+ self.repayment_periods = math.ceil((math.log(self.repayment_amount) -
+ math.log(self.repayment_amount - (self.loan_amount*monthly_interest_rate))) /
+ (math.log(1 + monthly_interest_rate)))
+ else:
+ self.repayment_periods = self.loan_amount / self.repayment_amount
self.total_payable_amount = self.repayment_amount * self.repayment_periods
self.total_payable_interest = self.total_payable_amount - self.loan_amount