From 0af31ed7ed2847449c705632126fc1e85ee936d0 Mon Sep 17 00:00:00 2001
From: Rohit Waghchaure <rohitw1991@gmail.com>
Date: Wed, 25 Jun 2025 18:05:03 +0530
Subject: [PATCH] fix: installed application patch

---
 frappe/patches.txt                            |  2 +-
 frappe/patches/v16_0/enable_setup_complete.py | 41 +++++++++++++------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/frappe/patches.txt b/frappe/patches.txt
index b2c8d7e0d6..074c422ab7 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -1,5 +1,5 @@
 [pre_model_sync]
-frappe.patches.v16_0.enable_setup_complete #25-06-2025
+frappe.patches.v16_0.enable_setup_complete #25-06-2025 re-run-patch
 frappe.patches.v15_0.remove_implicit_primary_key
 frappe.patches.v12_0.remove_deprecated_fields_from_doctype #3
 execute:frappe.utils.global_search.setup_global_search_table()
diff --git a/frappe/patches/v16_0/enable_setup_complete.py b/frappe/patches/v16_0/enable_setup_complete.py
index f07363bb2c..46c94aac8d 100644
--- a/frappe/patches/v16_0/enable_setup_complete.py
+++ b/frappe/patches/v16_0/enable_setup_complete.py
@@ -11,11 +11,12 @@ def execute():
 	):
 		is_setup_complete = 1
 
-	installed_apps = frappe.get_installed_apps(_ensure_on_bench=True)
-	for app_name in frappe.get_all("Installed Application", pluck="app_name"):
-		if app_name not in installed_apps:
-			continue
+	apps_details = frappe._dict({})
+	for details in frappe.utils.get_installed_apps_info():
+		apps_details[details.get("app_name")] = details
 
+	installed_apps = frappe.get_installed_apps(_ensure_on_bench=True)
+	for app_name in installed_apps:
 		has_setup_wizard = 0
 		if app_name == "frappe":
 			has_setup_wizard = 1
@@ -23,11 +24,27 @@ def execute():
 			has_setup_wizard = 1
 
 		if has_setup_wizard:
-			frappe.db.set_value(
-				"Installed Application",
-				{"app_name": app_name},
-				{
-					"has_setup_wizard": 1,
-					"is_setup_complete": is_setup_complete,
-				},
-			)
+			if not frappe.db.exists("Installed Application", {"app_name": app_name}):
+				apps_detail = apps_details.get(app_name, {})
+
+				frappe.get_doc(
+					{
+						"doctype": "Installed Application",
+						"app_name": app_name,
+						"has_setup_wizard": 1,
+						"is_setup_complete": 1,
+						"app_version": apps_detail.get("version", ""),
+						"git_branch": apps_detail.get("branch", ""),
+						"parent": "Installed Applications",
+						"parenttype": "installed_applications",
+					}
+				).insert(ignore_permissions=True)
+			else:
+				frappe.db.set_value(
+					"Installed Application",
+					{"app_name": app_name},
+					{
+						"has_setup_wizard": 1,
+						"is_setup_complete": is_setup_complete,
+					},
+				)