vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] system_country can be none

Browse source
This commit is contained in:
Rushabh Mehta 2017-06-27 17:45:09 +05:30
parent f5b975305d
commit 1ba6e32508
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
frappe/__init__.py
View file

@ -1364,6 +1364,6 @@ def get_active_domains():
return active_domains
def get_system_country():
if not local.system_country:
local.system_country = db.get_single_value('System Settings', 'country')
if local.system_country is None:
local.system_country = db.get_single_value('System Settings', 'country') or ''
return local.system_country

3
frappe/desk/form/meta.py
View file

@ -68,7 +68,8 @@ class FormMeta(Meta):
system_country = frappe.get_system_country()
self._add_code(_get_path(self.name + '.js'), '__js')
self._add_code(_get_path(os.path.join('regional', system_country + '.js')), '__js')
if system_country:
self._add_code(_get_path(os.path.join('regional', system_country + '.js')), '__js')
self._add_code(_get_path(self.name + '.css'), "__css")
self._add_code(_get_path(self.name + '_list.js'), '__list_js')
self._add_code(_get_path(self.name + '_calendar.js'), '__calendar_js')