diff --git a/frappe/patches/v9_1/resave_domain_settings.py b/frappe/patches/v9_1/resave_domain_settings.py index 1e70bf885c..63ad68751d 100644 --- a/frappe/patches/v9_1/resave_domain_settings.py +++ b/frappe/patches/v9_1/resave_domain_settings.py @@ -1,10 +1,12 @@ import frappe def execute(): - domains = ['Education', 'Healthcare', 'Hospitality'] + domain_settings = frappe.get_doc('Domain Settings') + active_domains = [d.domain for d in domain_settings.active_domains] try: - for d in domains: - domain = frappe.get_doc('Domain', d) - domain.setup_domain() + for d in ('Education', 'Healthcare', 'Hospitality'): + if d in active_domains and frappe.db.exists('Domain', d): + domain = frappe.get_doc('Domain', d) + domain.setup_domain() except frappe.LinkValidationError: pass diff --git a/frappe/patches/v9_1/revert_domain_settings.py b/frappe/patches/v9_1/revert_domain_settings.py index a2202986fd..1682651a51 100644 --- a/frappe/patches/v9_1/revert_domain_settings.py +++ b/frappe/patches/v9_1/revert_domain_settings.py @@ -5,6 +5,6 @@ def execute(): active_domains = [d.domain for d in domain_settings.active_domains] for domain_name in ('Education', 'Healthcare', 'Hospitality'): - if domain_name not in active_domains: + if frappe.db.exists('Domain', domain_name) and domain_name not in active_domains: domain = frappe.get_doc('Domain', domain_name) domain.remove_domain() \ No newline at end of file