| commit | bbadebcf645fa0916af61325761e5bc1912f7a37 | [log] [tgz] |
|---|---|---|
| author | Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> | Sat Feb 20 17:32:17 2021 +0530 |
| committer | GitHub <noreply@github.com> | Sat Feb 20 17:32:17 2021 +0530 |
| tree | a03c3f4a5fc3de7bf0439cb2461902873ceeaf37 | |
| parent | 535dc4aea2865a76d0564de7322504383d44f61f [diff] | |
| parent | 6f29f67a83462b6e110b2fa91230d985284400c8 [diff] |
Merge branch 'develop' into loan_exposure_report_fix
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py index 7d7992d..7978350 100644 --- a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py +++ b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
@@ -246,7 +246,5 @@ if not posting_date: posting_date = getdate() - precision = cint(frappe.db.get_default("currency_precision")) or 2 - - return flt((principal_amount * rate_of_interest) / (days_in_year(get_datetime(posting_date).year) * 100), precision) + return flt((principal_amount * rate_of_interest) / (days_in_year(get_datetime(posting_date).year) * 100))
diff --git a/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.py b/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.py index adc8013..8b6ea86 100644 --- a/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.py +++ b/erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.py
@@ -76,7 +76,7 @@ if qty: security_wise_map[key[1]]['applicant_count'] += 1 - total_portfolio_value += flt(qty * loan_security_details.get(key[1])['latest_price']) + total_portfolio_value += flt(qty * loan_security_details.get(key[1], {}).get('latest_price', 0)) return security_wise_map, total_portfolio_value