Merge branch 'develop' into wspace-new-design

frappe/model/document.py

@@ -188,6 +188,8 @@ class Document(BaseDocument):
 		is not set.
 
 		:param permtype: one of `read`, `write`, `submit`, `cancel`, `delete`"""
+		import frappe.permissions
+
 		if self.flags.ignore_permissions:
 			return True
 		return frappe.permissions.has_permission(self.doctype, permtype, self, verbose=verbose)

frappe/patches.txt

@@ -123,6 +123,7 @@ frappe.patches.v12_0.remove_parent_and_parenttype_from_print_formats
 frappe.patches.v12_0.remove_example_email_thread_notify
 execute:from frappe.desk.page.setup_wizard.install_fixtures import update_genders;update_genders()
 frappe.patches.v12_0.set_correct_url_in_files
+frappe.patches.v13_0.remove_invalid_options_for_data_fields
 frappe.patches.v13_0.website_theme_custom_scss
 frappe.patches.v13_0.make_user_type
 frappe.patches.v13_0.set_existing_dashboard_charts_as_public

frappe/patches/v13_0/remove_invalid_options_for_data_fields.py

@@ -0,0 +1,17 @@
+# Copyright (c) 2022, Frappe and Contributors
+# License: MIT. See LICENSE
+
+
+import frappe
+from frappe.model import data_field_options
+
+
+def execute():
+	custom_field = frappe.qb.DocType('Custom Field')
+	(frappe.qb
+		.update(custom_field)
+		.set(custom_field.options, None)
+		.where(
+			(custom_field.fieldtype == "Data")
+			& (custom_field.options.notin(data_field_options)))
+	).run()