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

Merge pull request #34738 from resilient-tech/regional++

Browse Source
This commit is contained in:
Sagar Vora
2023-04-20 05:17:57 -07:00
committed by GitHub
parent 76c4d9011f 776b56ccd1
commit 83a4c6dda8
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/__init__.py
View File

@@ -1,3 +1,4 @@
import functools
import inspect import inspect
import frappe import frappe
@@ -120,12 +121,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):
@@ -136,6 +139,7 @@ def allow_regional(fn):
def myfunction(): def myfunction():
pass""" pass"""
@functools.wraps(fn)
def caller(*args, **kwargs): def caller(*args, **kwargs):
overrides = frappe.get_hooks("regional_overrides", {}).get(get_region()) overrides = frappe.get_hooks("regional_overrides", {}).get(get_region())
function_path = f"{inspect.getmodule(fn).__name__}.{fn.__name__}" function_path = f"{inspect.getmodule(fn).__name__}.{fn.__name__}"

2
erpnext/accounts/party.py
View File

@@ -259,6 +259,8 @@ def set_address_details(
) )
if doctype in TRANSACTION_TYPES: if doctype in TRANSACTION_TYPES:
# required to set correct region
frappe.flags.company = company
get_regional_address_details(party_details, doctype, company) get_regional_address_details(party_details, doctype, company)
return party_address, shipping_address return party_address, shipping_address

2
erpnext/controllers/taxes_and_totals.py
View File

@@ -976,6 +976,8 @@ def get_itemised_tax_breakup_html(doc):
@frappe.whitelist() @frappe.whitelist()
def get_round_off_applicable_accounts(company, account_list): def get_round_off_applicable_accounts(company, account_list):
# required to set correct region
frappe.flags.company = company
account_list = get_regional_round_off_accounts(company, account_list) account_list = get_regional_round_off_accounts(company, account_list)
return account_list return account_list