fix: simplify erpnext.get_region
(cherry picked from commit 2fa641f86d)
This commit is contained in:
@@ -120,12 +120,14 @@ def get_region(company=None):
|
|||||||
|
|
||||||
You can also set global company flag in `frappe.flags.company`
|
You can also set global company flag in `frappe.flags.company`
|
||||||
"""
|
"""
|
||||||
if company or frappe.flags.company:
|
|
||||||
return frappe.get_cached_value("Company", company or frappe.flags.company, "country")
|
if not company:
|
||||||
elif frappe.flags.country:
|
company = frappe.local.flags.company
|
||||||
return frappe.flags.country
|
|
||||||
else:
|
if company:
|
||||||
return frappe.get_system_settings("country")
|
return frappe.get_cached_value("Company", company, "country")
|
||||||
|
|
||||||
|
return frappe.flags.country or frappe.get_system_settings("country")
|
||||||
|
|
||||||
|
|
||||||
def allow_regional(fn):
|
def allow_regional(fn):
|
||||||
|
|||||||
Reference in New Issue
Block a user