vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

chore: fix conflicts

Browse source
This commit is contained in:
rohitwaghchaure 2025-08-20 17:02:16 +05:30 • committed by GitHub
parent 6d1517e7fb
commit f66121e752
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/__init__.py
View file

@ -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