From 6d1517e7fb413c70fbea9e67126bb181665cd38f Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Wed, 20 Aug 2025 15:40:07 +0530 Subject: [PATCH 1/3] fix: only consider the Frappe and ERPNext apps for setup completion checks (cherry picked from commit d5e1bf06b2b42cea72ee827582831e79edefee66) # Conflicts: # frappe/__init__.py --- frappe/__init__.py | 11 +++++++++++ .../installed_applications.py | 14 ++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index aa733919c6..3d931c6f23 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1511,8 +1511,19 @@ def is_setup_complete(): if not frappe.db.table_exists("Installed Application"): return setup_complete +<<<<<<< HEAD if all(frappe.get_all("Installed Application", {"has_setup_wizard": 1}, pluck="is_setup_complete")): setup_complete = True +======= + if all( + frappe.get_all( + "Installed Application", + {"app_name": ("in", ["frappe", "erpnext"])}, + pluck="is_setup_complete", + ) + ): + is_setup_complete = True +>>>>>>> d5e1bf06b2 (fix: only consider the Frappe and ERPNext apps for setup completion checks) return setup_complete diff --git a/frappe/core/doctype/installed_applications/installed_applications.py b/frappe/core/doctype/installed_applications/installed_applications.py index 2a6d844a27..9ceb8e989c 100644 --- a/frappe/core/doctype/installed_applications/installed_applications.py +++ b/frappe/core/doctype/installed_applications/installed_applications.py @@ -32,17 +32,11 @@ class InstalledApplications(Document): self.delete_key("installed_applications") for app in frappe.utils.get_installed_apps_info(): - has_setup_wizard = 0 - if app.get("app_name") == "frappe" or frappe.get_hooks(app_name=app.get("app_name")).get( - "setup_wizard_stages" - ): - has_setup_wizard = 1 - + has_setup_wizard = 1 setup_complete = app_wise_setup_details.get(app.get("app_name")) or 0 - if app.get("app_name") == "india_compliance": - setup_complete = app_wise_setup_details.get("erpnext") or 0 - if app.get("app_name") == "insights": - setup_complete = app_wise_setup_details.get("frappe") or 0 + if app.get("app_name") not in ["frappe", "erpnext"]: + setup_complete = 0 + has_setup_wizard = 0 self.append( "installed_applications", From f66121e7522baf4ef716da2ffa66a7960d4528a0 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 20 Aug 2025 17:02:16 +0530 Subject: [PATCH 2/3] chore: fix conflicts --- frappe/__init__.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 3d931c6f23..18958035fb 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1511,10 +1511,6 @@ def is_setup_complete(): if not frappe.db.table_exists("Installed Application"): return setup_complete -<<<<<<< HEAD - if all(frappe.get_all("Installed Application", {"has_setup_wizard": 1}, pluck="is_setup_complete")): - setup_complete = True -======= if all( frappe.get_all( "Installed Application", @@ -1523,7 +1519,6 @@ def is_setup_complete(): ) ): is_setup_complete = True ->>>>>>> d5e1bf06b2 (fix: only consider the Frappe and ERPNext apps for setup completion checks) return setup_complete From b47e5d47c21d30c62b7eaeb9be625c2ba33bbc26 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Wed, 20 Aug 2025 17:37:39 +0530 Subject: [PATCH 3/3] chore: fix issue --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 18958035fb..53bd569f90 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1518,7 +1518,7 @@ def is_setup_complete(): pluck="is_setup_complete", ) ): - is_setup_complete = True + setup_complete = True return setup_complete