Merge branch 'develop'

frappe · Jan 29, 2023 · 4233685 · 4233685
2 parents 5f0771b + 32a62fc
commit 4233685
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 40 deletions.
diff --git a/ecommerce_integrations/patches.txt b/ecommerce_integrations/patches.txt
@@ -1,2 +1 @@
 ecommerce_integrations.patches.update_shopify_custom_fields
-ecommerce_integrations.patches.copy_amazon_single_doc
diff --git a/ecommerce_integrations/patches/copy_amazon_single_doc.py b/ecommerce_integrations/patches/copy_amazon_single_doc.py
diff --git a/ecommerce_integrations/shopify/utils.py b/ecommerce_integrations/shopify/utils.py
@@ -37,7 +37,8 @@ def migrate_from_old_connector(payload=None, request_id=None):
 def ensure_old_connector_is_disabled():
 	try:
 		old_setting = frappe.get_doc(OLD_SETTINGS_DOCTYPE)
-	except ImportError:
+	except Exception:
+		frappe.clear_last_message()
 		return
 
 	if old_setting.enable_shopify: