Merge branch 'hotfix'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index d1e9417..30b021e 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@
import frappe
from erpnext.hooks import regional_overrides
-__version__ = '9.2.14'
+__version__ = '9.2.15'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches/v9_2/rename_translated_domains_in_en.py b/erpnext/patches/v9_2/rename_translated_domains_in_en.py
index 88ffbb7..168605d 100644
--- a/erpnext/patches/v9_2/rename_translated_domains_in_en.py
+++ b/erpnext/patches/v9_2/rename_translated_domains_in_en.py
@@ -4,7 +4,9 @@
def execute():
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")
@@ -16,11 +18,14 @@
domain_settings = frappe.get_single("Domain Settings")
active_domains = [d.domain for d in domain_settings.active_domains]
- for domain in active_domains:
- domain = frappe.get_doc("Domain", domain)
- domain.setup_domain()
+ try:
+ for domain in active_domains:
+ domain = frappe.get_doc("Domain", domain)
+ domain.setup_domain()
- if int(frappe.db.get_single_value('System Settings', 'setup_complete')):
- domain.setup_sidebar_items()
- domain.setup_desktop_icons()
- domain.set_default_portal_role()
+ if int(frappe.db.get_single_value('System Settings', 'setup_complete')):
+ domain.setup_sidebar_items()
+ domain.setup_desktop_icons()
+ domain.set_default_portal_role()
+ except frappe.LinkValidationError:
+ pass
\ No newline at end of file