Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into fix-valuation-errror-customer-provided

Browse Source
This commit is contained in:
Marica 2021-02-22 16:00:28 +05:30 committed by GitHub
commit 28c834ac95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
View File

@ -43,11 +43,11 @@ class AccountingDimension(Document):
if frappe.flags.in_test: if frappe.flags.in_test:
make_dimension_in_accounting_doctypes(doc=self) make_dimension_in_accounting_doctypes(doc=self)
else: else:
frappe.enqueue(make_dimension_in_accounting_doctypes, doc=self) frappe.enqueue(make_dimension_in_accounting_doctypes, doc=self, queue='long')
def on_trash(self): def on_trash(self):
if frappe.flags.in_test: if frappe.flags.in_test:
delete_accounting_dimension(doc=self) delete_accounting_dimension(doc=self, queue='long')
else: else:
frappe.enqueue(delete_accounting_dimension, doc=self) frappe.enqueue(delete_accounting_dimension, doc=self)

4
erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
View File

@ -246,5 +246,7 @@ def get_per_day_interest(principal_amount, rate_of_interest, posting_date=None):
if not posting_date: if not posting_date:
posting_date = getdate() posting_date = getdate()
return flt((principal_amount * rate_of_interest) / (days_in_year(get_datetime(posting_date).year) * 100)) 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)

2
erpnext/loan_management/report/loan_security_exposure/loan_security_exposure.py
View File

@ -76,7 +76,7 @@ def get_company_wise_loan_security_details(filters, loan_security_details):
if qty: if qty:
security_wise_map[key[1]]['applicant_count'] += 1 security_wise_map[key[1]]['applicant_count'] += 1
total_portfolio_value += flt(qty * loan_security_details.get(key[1], {}).get('latest_price', 0)) total_portfolio_value += flt(qty * loan_security_details.get(key[1])['latest_price'])
return security_wise_map, total_portfolio_value return security_wise_map, total_portfolio_value