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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Saurabh 2017-11-17 14:55:23 +05:30
commit a5b53e9480
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -4,7 +4,7 @@ import inspect
import frappe import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
__version__ = '9.2.14' __version__ = '9.2.15'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

21
erpnext/patches/v9_2/rename_translated_domains_in_en.py
View File

@ -4,7 +4,9 @@ from frappe import _
def execute(): def execute():
language = frappe.get_single("System Settings").language language = frappe.get_single("System Settings").language
if language.startswith('en'): return if language and language.startswith('en'): return
frappe.local.lang = language
all_domains = frappe.get_hooks("domains") all_domains = frappe.get_hooks("domains")
@ -16,11 +18,14 @@ def execute():
domain_settings = frappe.get_single("Domain Settings") domain_settings = frappe.get_single("Domain Settings")
active_domains = [d.domain for d in domain_settings.active_domains] active_domains = [d.domain for d in domain_settings.active_domains]
for domain in active_domains: try:
domain = frappe.get_doc("Domain", domain) for domain in active_domains:
domain.setup_domain() domain = frappe.get_doc("Domain", domain)
domain.setup_domain()
if int(frappe.db.get_single_value('System Settings', 'setup_complete')): if int(frappe.db.get_single_value('System Settings', 'setup_complete')):
domain.setup_sidebar_items() domain.setup_sidebar_items()
domain.setup_desktop_icons() domain.setup_desktop_icons()
domain.set_default_portal_role() domain.set_default_portal_role()
except frappe.LinkValidationError:
pass