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

[fix] do not translate domains while creating db record (#11616)

Browse Source
This commit is contained in:
Saurabh 2017-11-17 12:29:26 +05:30 committed by Nabin Hait
parent 51a397c97f
commit 3499ba08df
4 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/patches.txt
View File

@ -460,3 +460,4 @@ erpnext.patches.v9_0.remove_non_existing_warehouse_from_stock_settings
execute:frappe.delete_doc_if_exists("DocType", "Program Fee") execute:frappe.delete_doc_if_exists("DocType", "Program Fee")
erpnext.patches.v9_0.update_employee_loan_details erpnext.patches.v9_0.update_employee_loan_details
erpnext.patches.v9_2.delete_healthcare_domain_default_items erpnext.patches.v9_2.delete_healthcare_domain_default_items
erpnext.patches.v9_2.rename_translated_domains_in_en

26
erpnext/patches/v9_2/rename_translated_domains_in_en.py Normal file
View File

@ -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()

12
erpnext/setup/setup_wizard/install_fixtures.py
View File

@ -14,12 +14,12 @@ default_lead_sources = ["Existing Customer", "Reference", "Advertisement",
def install(country=None): def install(country=None):
records = [ records = [
# domains # domains
{ 'doctype': 'Domain', 'domain': _('Distribution')}, { 'doctype': 'Domain', 'domain': 'Distribution'},
{ 'doctype': 'Domain', 'domain': _('Manufacturing')}, { 'doctype': 'Domain', 'domain': 'Manufacturing'},
{ 'doctype': 'Domain', 'domain': _('Retail')}, { 'doctype': 'Domain', 'domain': 'Retail'},
{ 'doctype': 'Domain', 'domain': _('Services')}, { 'doctype': 'Domain', 'domain': 'Services'},
{ 'doctype': 'Domain', 'domain': _('Education')}, { 'doctype': 'Domain', 'domain': 'Education'},
{ 'doctype': 'Domain', 'domain': _('Healthcare')}, { 'doctype': 'Domain', 'domain': 'Healthcare'},
# Setup Progress # Setup Progress
{'doctype': "Setup Progress", "actions": [ {'doctype': "Setup Progress", "actions": [

6
erpnext/setup/setup_wizard/setup_wizard.py
View File

@ -40,7 +40,7 @@ def setup_complete(args=None):
frappe.local.message_log = [] frappe.local.message_log = []
domain_settings = frappe.get_single('Domain Settings') 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() frappe.db.commit()
login_as_first_user(args) login_as_first_user(args)
@ -186,10 +186,6 @@ def set_defaults(args):
hr_settings.emp_created_by = "Naming Series" hr_settings.emp_created_by = "Naming Series"
hr_settings.save() 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(): def create_feed_and_todo():
"""update Activity feed and create todo for creation of item, customer, vendor""" """update Activity feed and create todo for creation of item, customer, vendor"""
add_info_comment(**{ add_info_comment(**{