From 45fd819729a73be9e334194e64ad00e81b36dabc Mon Sep 17 00:00:00 2001
From: Subin Tom <subintom2@gmail.com>
Date: Mon, 8 Nov 2021 18:03:44 +0530
Subject: [PATCH] fix: company condition fix, added company field

(cherry picked from commit 7ad2717accea61883f98d418b4abed47ca3937a8)
---
 .../doctype/taxjar_settings/taxjar_settings.json         | 9 ++++++++-
 erpnext/erpnext_integrations/taxjar_integration.py       | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.json b/erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.json
index d9ae5b601c..23ccb7e4da 100644
--- a/erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.json
+++ b/erpnext/erpnext_integrations/doctype/taxjar_settings/taxjar_settings.json
@@ -14,6 +14,7 @@
   "cb_keys",
   "sandbox_api_key",
   "configuration",
+  "company",
   "column_break_10",
   "tax_account_head",
   "configuration_cb",
@@ -109,11 +110,17 @@
   {
    "fieldname": "column_break_10",
    "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "label": "Company",
+   "options": "Company"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2021-11-08 17:57:17.323275",
+ "modified": "2021-11-08 18:02:29.232090",
  "modified_by": "Administrator",
  "module": "ERPNext Integrations",
  "name": "TaxJar Settings",
diff --git a/erpnext/erpnext_integrations/taxjar_integration.py b/erpnext/erpnext_integrations/taxjar_integration.py
index 1adc1ddb14..a4e21579e3 100644
--- a/erpnext/erpnext_integrations/taxjar_integration.py
+++ b/erpnext/erpnext_integrations/taxjar_integration.py
@@ -159,7 +159,7 @@ def set_sales_tax(doc, method):
 	if not TAXJAR_CALCULATE_TAX:
 		return
 
-	if get_region(doc.company):
+	if get_region(doc.company) != 'United States':
 		return
 
 	if not doc.items: