[fix] do not translate domains while creating db record (#11616)
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 1ae99a3..e3d61d9 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -460,3 +460,4 @@
execute:frappe.delete_doc_if_exists("DocType", "Program Fee")
erpnext.patches.v9_0.update_employee_loan_details
erpnext.patches.v9_2.delete_healthcare_domain_default_items
+erpnext.patches.v9_2.rename_translated_domains_in_en
diff --git a/erpnext/patches/v9_2/rename_translated_domains_in_en.py b/erpnext/patches/v9_2/rename_translated_domains_in_en.py
new file mode 100644
index 0000000..88ffbb7
--- /dev/null
+++ b/erpnext/patches/v9_2/rename_translated_domains_in_en.py
@@ -0,0 +1,26 @@
+import frappe
+from frappe import _
+
+def execute():
+ language = frappe.get_single("System Settings").language
+
+ if language.startswith('en'): return
+
+ all_domains = frappe.get_hooks("domains")
+
+ for domain in all_domains:
+ translated_domain = _(domain, lang=language)
+ if frappe.db.exists("Domain", translated_domain):
+ frappe.rename_doc("Domain", translated_domain, domain, ignore_permissions=True, merge=True)
+
+ 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()
+
+ if int(frappe.db.get_single_value('System Settings', 'setup_complete')):
+ domain.setup_sidebar_items()
+ domain.setup_desktop_icons()
+ domain.set_default_portal_role()
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index e6a4a81..0f98214 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -14,12 +14,12 @@
def install(country=None):
records = [
# domains
- { 'doctype': 'Domain', 'domain': _('Distribution')},
- { 'doctype': 'Domain', 'domain': _('Manufacturing')},
- { 'doctype': 'Domain', 'domain': _('Retail')},
- { 'doctype': 'Domain', 'domain': _('Services')},
- { 'doctype': 'Domain', 'domain': _('Education')},
- { 'doctype': 'Domain', 'domain': _('Healthcare')},
+ { 'doctype': 'Domain', 'domain': 'Distribution'},
+ { 'doctype': 'Domain', 'domain': 'Manufacturing'},
+ { 'doctype': 'Domain', 'domain': 'Retail'},
+ { 'doctype': 'Domain', 'domain': 'Services'},
+ { 'doctype': 'Domain', 'domain': 'Education'},
+ { 'doctype': 'Domain', 'domain': 'Healthcare'},
# Setup Progress
{'doctype': "Setup Progress", "actions": [
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 766f9b5..28e617f 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -40,7 +40,7 @@
frappe.local.message_log = []
domain_settings = frappe.get_single('Domain Settings')
- domain_settings.set_active_domains([_(args.get('domain'))])
+ domain_settings.set_active_domains([args.get('domain')])
frappe.db.commit()
login_as_first_user(args)
@@ -186,10 +186,6 @@
hr_settings.emp_created_by = "Naming Series"
hr_settings.save()
- domain_settings = frappe.get_doc("Domain Settings")
- domain_settings.append('active_domains', dict(domain=_(args.get('domain'))))
- domain_settings.save()
-
def create_feed_and_todo():
"""update Activity feed and create todo for creation of item, customer, vendor"""
add_info_comment(**{