From 506847845477e09da9263011e9c086fda0cc603e Mon Sep 17 00:00:00 2001 From: Corentin Forler Date: Fri, 7 Mar 2025 12:40:38 +0100 Subject: [PATCH] fix: Fix old patches --- .../dokos/v1_0/remove_agriculture_domain.py | 56 ++++----------- .../dokos/v1_0/remove_education_domain.py | 70 +++++-------------- .../dokos/v1_0/remove_healthcare_domain.py | 53 ++++---------- .../dokos/v1_0/remove_hospitality_domain.py | 59 +++++----------- 4 files changed, 60 insertions(+), 178 deletions(-) diff --git a/erpnext/patches/dokos/v1_0/remove_agriculture_domain.py b/erpnext/patches/dokos/v1_0/remove_agriculture_domain.py index d39df4ed4b..1a8fdd60fe 100644 --- a/erpnext/patches/dokos/v1_0/remove_agriculture_domain.py +++ b/erpnext/patches/dokos/v1_0/remove_agriculture_domain.py @@ -7,42 +7,23 @@ def execute(): roles = ["Agriculture Manager", "Agriculture User"] doctypes = [x["name"] for x in frappe.get_all("DocType", filters={"module": "Agriculture"})] - frappe.db.sql( - """ - DELETE - FROM - `tabHas Role` - WHERE - role in ({0}) - """.format( - ",".join(["%s"] * len(roles)) - ), - tuple(roles), - ) + try: + frappe.db.delete("Has Role", {"role": ("in", roles)}) + except Exception as e: + print(e) - if doctypes: - # Standard portal items - frappe.db.sql( - """ - DELETE - FROM - `tabPortal Menu Item` - WHERE - reference_doctype in ({0}) - """.format( - ",".join(["%s"] * len(doctypes)) - ), - tuple(doctypes), - ) + # Standard portal items + try: + frappe.db.delete("Portal Menu Item", {"reference_doctype": ("in", doctypes)}) + except Exception as e: + print(e) # Delete DocTypes, Pages, Reports, Roles, Domain and Custom Fields elements = [ {"document": "Item Group", "items": ["Fertilizer", "Seed", "By-product", "Produce"]}, { "document": "Report", - "items": [ - x["name"] for x in frappe.get_all("Report", filters={"ref_doctype": ["in", doctypes]}) - ], + "items": [x["name"] for x in frappe.get_all("Report", filters={"ref_doctype": ["in", doctypes]})], }, {"document": "DocType", "items": doctypes}, {"document": "Role", "items": roles}, @@ -73,16 +54,7 @@ def execute(): "Water Analysis", "Weather", ] - - frappe.db.sql( - """ - DELETE - FROM - `tabDesktop Icon` - WHERE - module_name in ({0}) - """.format( - ",".join(["%s"] * len(desktop_icons)) - ), - tuple(desktop_icons), - ) + try: + frappe.db.delete("Desktop Icon", {"module_name": ("in", desktop_icons)}) + except Exception as e: + print(e) diff --git a/erpnext/patches/dokos/v1_0/remove_education_domain.py b/erpnext/patches/dokos/v1_0/remove_education_domain.py index e4ddee3941..58dd962b58 100644 --- a/erpnext/patches/dokos/v1_0/remove_education_domain.py +++ b/erpnext/patches/dokos/v1_0/remove_education_domain.py @@ -7,46 +7,21 @@ def execute(): roles = ["Student", "Instructor", "Academics User", "Education Manager", "Guardian"] doctypes = [x["name"] for x in frappe.get_all("DocType", filters={"module": "Education"})] - frappe.db.sql( - """ - DELETE - FROM - `tabHas Role` - WHERE - role in ({0}) - """.format( - ",".join(["%s"] * len(roles)) - ), - tuple(roles), - ) + try: + frappe.db.delete("Has Role", {"role": ("in", roles)}) + except Exception as e: + print(e) - frappe.db.sql( - """ - DELETE - FROM - `tabDocPerm` - WHERE - role in ({0}) - """.format( - ",".join(["%s"] * len(roles)) - ), - tuple(roles), - ) + try: + frappe.db.delete("DocPerm", {"role": ("in", roles)}) + except Exception as e: + print(e) # Standard portal items - if doctypes: - frappe.db.sql( - """ - DELETE - FROM - `tabPortal Menu Item` - WHERE - reference_doctype in ({0}) - """.format( - ",".join(["%s"] * len(doctypes)) - ), - tuple(doctypes), - ) + try: + frappe.db.delete("Portal Menu Item", {"reference_doctype": ("in", doctypes)}) + except Exception as e: + print(e) # Delete DocTypes, Pages, Reports, Roles, Domain and Custom Fields @@ -57,9 +32,7 @@ def execute(): }, { "document": "Report", - "items": [ - x["name"] for x in frappe.get_all("Report", filters={"ref_doctype": ["in", doctypes]}) - ], + "items": [x["name"] for x in frappe.get_all("Report", filters={"ref_doctype": ["in", doctypes]})], }, {"document": "DocType", "items": doctypes}, { @@ -80,16 +53,7 @@ def execute(): # Delete Desktop Icons desktop_icons = ["Student", "Program", "Course", "Student Group", "Instructor", "Fees"] - - frappe.db.sql( - """ - DELETE - FROM - `tabDesktop Icon` - WHERE - module_name in ({0}) - """.format( - ",".join(["%s"] * len(desktop_icons)) - ), - tuple(desktop_icons), - ) + try: + frappe.db.delete("Desktop Icon", {"module_name": ("in", desktop_icons)}) + except Exception as e: + print(e) diff --git a/erpnext/patches/dokos/v1_0/remove_healthcare_domain.py b/erpnext/patches/dokos/v1_0/remove_healthcare_domain.py index 925eec4a2d..406ec49439 100644 --- a/erpnext/patches/dokos/v1_0/remove_healthcare_domain.py +++ b/erpnext/patches/dokos/v1_0/remove_healthcare_domain.py @@ -14,32 +14,16 @@ def execute(): ] doctypes = [x["name"] for x in frappe.get_all("DocType", filters={"module": "Healthcare"})] - frappe.db.sql( - """ - DELETE - FROM - `tabHas Role` - WHERE - role in ({0}) - """.format( - ",".join(["%s"] * len(roles)) - ), - tuple(roles), - ) + try: + frappe.db.delete("Has Role", {"role": ("in", roles)}) + except Exception as e: + print(e) # Standard portal items - frappe.db.sql( - """ - DELETE - FROM - `tabPortal Menu Item` - WHERE - reference_doctype in ({0}) - """.format( - ",".join(["%s"] * len(doctypes)) - ), - tuple(doctypes), - ) + try: + frappe.db.delete("Portal Menu Item", {"reference_doctype": ("in", doctypes)}) + except Exception as e: + print(e) # Delete DocTypes, Pages, Reports, Roles, Domain and Custom Fields @@ -61,9 +45,7 @@ def execute(): }, { "document": "Report", - "items": [ - x["name"] for x in frappe.get_all("Report", filters={"ref_doctype": ["in", doctypes]}) - ], + "items": [x["name"] for x in frappe.get_all("Report", filters={"ref_doctype": ["in", doctypes]})], }, {"document": "DocType", "items": doctypes}, { @@ -93,16 +75,7 @@ def execute(): "Clinical Procedure", "Inpatient Record", ] - - frappe.db.sql( - """ - DELETE - FROM - `tabDesktop Icon` - WHERE - module_name in ({0}) - """.format( - ",".join(["%s"] * len(desktop_icons)) - ), - tuple(desktop_icons), - ) + try: + frappe.db.delete("Desktop Icon", {"module_name": ("in", desktop_icons)}) + except Exception as e: + print(e) diff --git a/erpnext/patches/dokos/v1_0/remove_hospitality_domain.py b/erpnext/patches/dokos/v1_0/remove_hospitality_domain.py index 443cbacccb..37add3c734 100644 --- a/erpnext/patches/dokos/v1_0/remove_hospitality_domain.py +++ b/erpnext/patches/dokos/v1_0/remove_hospitality_domain.py @@ -5,36 +5,19 @@ def execute(): # Delete assigned roles roles = ["Hotel Manager", "Hotel Reservation User", "Restaurant Manager"] doctypes = [ - x["name"] - for x in frappe.get_all("DocType", filters={"module": ["in", ["Restaurant", "Hotels"]]}) + x["name"] for x in frappe.get_all("DocType", filters={"module": ["in", ["Restaurant", "Hotels"]]}) ] - frappe.db.sql( - """ - DELETE - FROM - `tabHas Role` - WHERE - role in ({0}) - """.format( - ",".join(["%s"] * len(roles)) - ), - tuple(roles), - ) + try: + frappe.db.delete("Has Role", {"role": ("in", roles)}) + except Exception as e: + print(e) # Standard portal items - frappe.db.sql( - """ - DELETE - FROM - `tabPortal Menu Item` - WHERE - reference_doctype in ({0}) - """.format( - ",".join(["%s"] * len(doctypes)) - ), - tuple(doctypes), - ) + try: + frappe.db.delete("Portal Menu Item", {"reference_doctype": ("in", doctypes)}) + except Exception as e: + print(e) # Delete DocTypes, Pages, Reports, Roles, Domain and Custom Fields elements = [ @@ -48,15 +31,14 @@ def execute(): }, { "document": "Report", - "items": [ - x["name"] for x in frappe.get_all("Report", filters={"ref_doctype": ["in", doctypes]}) - ], + "items": [x["name"] for x in frappe.get_all("Report", filters={"ref_doctype": ["in", doctypes]})], }, {"document": "DocType", "items": doctypes}, { "document": "Page", "items": [ - x["name"] for x in frappe.get_all("Page", filters={"module": ["in", ["Restaurant", "Hotels"]]}) + x["name"] + for x in frappe.get_all("Page", filters={"module": ["in", ["Restaurant", "Hotels"]]}) ], }, {"document": "Role", "items": roles}, @@ -73,16 +55,7 @@ def execute(): # Delete Desktop Icons desktop_icons = ["Hotels", "Restaurant"] - - frappe.db.sql( - """ - DELETE - FROM - `tabDesktop Icon` - WHERE - module_name in ({0}) - """.format( - ",".join(["%s"] * len(desktop_icons)) - ), - tuple(desktop_icons), - ) + try: + frappe.db.delete("Desktop Icon", {"module_name": ("in", desktop_icons)}) + except Exception as e: + print(e) -- GitLab