Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations

This commit is contained in:
Suraj Shetty
2020-01-29 15:06:50 +05:30
125 changed files with 18290 additions and 14829 deletions

View File

@@ -640,8 +640,9 @@ def get_outstanding_invoices(party_type, party, account, condition=None, filters
precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2
if account:
root_type = frappe.get_cached_value("Account", account, "root_type")
root_type, account_type = frappe.get_cached_value("Account", account, ["root_type", "account_type"])
party_account_type = "Receivable" if root_type == "Asset" else "Payable"
party_account_type = account_type or party_account_type
else:
party_account_type = erpnext.get_party_account_type(party_type)