nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 18:59:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix'

Browse Source
This commit is contained in:
mbauskar
2017-07-18 15:10:19 +05:30
parent 113df55e64 823b3ca540
commit 8f42f60dc9
3 changed files with 11 additions and 4 deletions
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__ = '8.5.0' __version__ = '8.5.1'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

3
erpnext/patches/v8_3/set_restrict_to_domain_for_module_def.py
View File

@@ -10,4 +10,5 @@ def execute():
""" set the restrict to domain in module def """ """ set the restrict to domain in module def """
frappe.reload_doc("core", "doctype", "module_def") frappe.reload_doc("core", "doctype", "module_def")
update_module_def_restrict_to_domain() if frappe.db.get_single_value('System Settings', 'setup_complete'):
update_module_def_restrict_to_domain()

10
erpnext/setup/setup_wizard/domainify.py
View File

@@ -151,8 +151,14 @@ def update_module_def_restrict_to_domain():
""" set the restrict to domain for the module def """ """ set the restrict to domain for the module def """
module_def_restrict_to_domain_mapper = { module_def_restrict_to_domain_mapper = {
"Schools": _('Education') "Schools": 'Education'
} }
lang = frappe.db.get_single_value("System Settings", "language") or "en"
for module, domain in module_def_restrict_to_domain_mapper.iteritems(): for module, domain in module_def_restrict_to_domain_mapper.iteritems():
frappe.set_value("Module Def", module, "restrict_to_domain", domain) if frappe.db.exists("Domain", _(domain, lang)):
frappe.set_value("Module Def", module, "restrict_to_domain", _(domain, lang))
elif frappe.db.exists("Domain", domain):
frappe.set_value("Module Def", module, "restrict_to_domain", domain)
else:
pass