| commit | 85c91ca2dbda23ca239ef9e0446db845ed7b7174 | [log] [tgz] |
|---|---|---|
| author | Saqib Ansari <nextchamp.saqib@gmail.com> | Tue Feb 23 15:56:29 2021 +0530 |
| committer | Saqib Ansari <nextchamp.saqib@gmail.com> | Tue Feb 23 15:56:29 2021 +0530 |
| tree | 29bf2650d1a4a153f7fa4e77fbb18fe326620c68 | |
| parent | 2fb3647a4cf957bb94a1d7f2da67e3e1e6580652 [diff] [blame] |
Merge branch 'develop' into tcs_calculation
diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 5a5c448..199a183 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py
@@ -109,7 +109,7 @@ ''' if company or frappe.flags.company: return frappe.get_cached_value('Company', - company or frappe.flags.company, 'country') + company or frappe.flags.company, 'country') elif frappe.flags.country: return frappe.flags.country else: