Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into stock-ageing-v12

This commit is contained in:
deepeshgarg007 2019-07-26 13:32:11 +05:30
commit 2f87fd7951
2 changed files with 4 additions and 2 deletions

View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
__version__ = '12.0.0'
__version__ = '12.0.1'
def get_default_company(user=None):
'''Get default company for user'''

View File

@ -123,7 +123,9 @@ class Account(NestedSet):
doc.flags.ignore_root_company_validation = True
doc.update({
"company": company,
"account_currency": None,
# parent account's currency should be passed down to child account's curreny
# if it is None, it picks it up from default company currency, which might be unintended
"account_currency": self.account_currency,
"parent_account": parent_acc_name_map[company]
})
doc.save()