diff --git a/frappe/installer.py b/frappe/installer.py index 577f209813..d30da41a6c 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -217,7 +217,7 @@ def add_module_defs(app): d.save() def remove_missing_apps(): - apps = ('frappe_subscription',) + apps = ('frappe_subscription', 'shopping_cart') installed_apps = frappe.get_installed_apps() for app in apps: if app in installed_apps: diff --git a/frappe/model/rename_doc.py b/frappe/model/rename_doc.py index 24ecc20d2e..f247f5c531 100644 --- a/frappe/model/rename_doc.py +++ b/frappe/model/rename_doc.py @@ -25,7 +25,9 @@ def rename_doc(doctype, old, new, force=False, merge=False, ignore_permissions=F old_doc = frappe.get_doc(doctype, old) out = old_doc.run_method("before_rename", old, new, merge) or {} new = (out.get("new") or new) if isinstance(out, dict) else (out or new) - new = validate_rename(doctype, new, meta, merge, force, ignore_permissions) + + if doctype != "DocType": + new = validate_rename(doctype, new, meta, merge, force, ignore_permissions) if not merge: rename_parent_and_child(doctype, old, new, meta) diff --git a/frappe/patches/v5_0/update_shared.py b/frappe/patches/v5_0/update_shared.py index 8debe6def5..5275bba0e4 100644 --- a/frappe/patches/v5_0/update_shared.py +++ b/frappe/patches/v5_0/update_shared.py @@ -10,7 +10,7 @@ def execute(): # every user must have access to his / her own detail for user in frappe.get_all("User", filters={"user_type": "System User"}): - frappe.share.add("User", user.name, user.name, write=1) + frappe.share.add("User", user.name, user.name, share=1) # move event user to shared if frappe.db.exists("DocType", "Event User"): diff --git a/frappe/patches/v5_0/v4_to_v5.py b/frappe/patches/v5_0/v4_to_v5.py index 0e45935ad1..f23c7e43b0 100644 --- a/frappe/patches/v5_0/v4_to_v5.py +++ b/frappe/patches/v5_0/v4_to_v5.py @@ -2,12 +2,10 @@ import frappe def execute(): changed = ( - ("desk", ("feed", "event", "event_role", "event_user", "todo", - "note", "note_user")), + ("desk", ("feed", "event", "event_role", "todo", "note")), ("custom", ("custom_field", "custom_script", "customize_form", "customize_form_field", "property_setter")), - ("email", ("bulk_email", "email_alert", "email_alert_recipient", - "standard_reply")), + ("email", ("bulk_email", "email_alert", "email_alert_recipient", "standard_reply")), ("geo", ("country", "currency")), ("print", ("letter_head", "print_format", "print_settings")) )