fix: patch fixes- force reload doc, check for company

asoral · Oct 11, 2021 · 1799b55 · 1799b55
1 parent a183cfc
commit 1799b55
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py b/erpnext/patches/v13_0/custom_fields_for_taxjar_integration.py
@@ -8,14 +8,17 @@
 
 def execute():
 
-	frappe.reload_doctype("Taxjar Settings")
+	company = frappe.get_all('Company', filters = {'country': 'United States'}, fields=['name'])
+	if not company:
+		return
+
+	frappe.reload_doctype("Taxjar Settings", force=True)
 
 	TAXJAR_CREATE_TRANSACTIONS = frappe.db.get_single_value("TaxJar Settings", "taxjar_create_transactions")
 	TAXJAR_CALCULATE_TAX = frappe.db.get_single_value("TaxJar Settings", "taxjar_calculate_tax")
 	TAXJAR_SANDBOX_MODE = frappe.db.get_single_value("TaxJar Settings", "is_sandbox")
-	company = frappe.get_all('Company', filters = {'country': 'United States'}, fields=['name'])
 
-	if not company or (not TAXJAR_CREATE_TRANSACTIONS and not TAXJAR_CALCULATE_TAX and not TAXJAR_SANDBOX_MODE):
+	if (not TAXJAR_CREATE_TRANSACTIONS and not TAXJAR_CALCULATE_TAX and not TAXJAR_SANDBOX_MODE):
 		return
 
 	frappe.reload_doctype("Product Tax Category")