From 806d13dbb9eaf80fcaf62262eba9f91d8f4fb49d Mon Sep 17 00:00:00 2001 From: Jeroen Peperkamp Date: Wed, 17 Jul 2024 23:44:58 +0800 Subject: [PATCH] fix!: sort exported customizations by name for better diffs (#26927) * fix: sort exported customizations by name for better diffs * fix formatting --------- Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com> --- frappe/modules/utils.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/frappe/modules/utils.py b/frappe/modules/utils.py index adcc55e4a8..2c034d3bbf 100644 --- a/frappe/modules/utils.py +++ b/frappe/modules/utils.py @@ -64,16 +64,20 @@ def export_customizations( frappe.throw(_("Only allowed to export customizations in developer mode")) custom = { - "custom_fields": frappe.get_all("Custom Field", fields="*", filters={"dt": doctype}), - "property_setters": frappe.get_all("Property Setter", fields="*", filters={"doc_type": doctype}), + "custom_fields": frappe.get_all("Custom Field", fields="*", filters={"dt": doctype}, order_by="name"), + "property_setters": frappe.get_all( + "Property Setter", fields="*", filters={"doc_type": doctype}, order_by="name" + ), "custom_perms": [], - "links": frappe.get_all("DocType Link", fields="*", filters={"parent": doctype}), + "links": frappe.get_all("DocType Link", fields="*", filters={"parent": doctype}, order_by="name"), "doctype": doctype, "sync_on_migrate": sync_on_migrate, } if with_permissions: - custom["custom_perms"] = frappe.get_all("Custom DocPerm", fields="*", filters={"parent": doctype}) + custom["custom_perms"] = frappe.get_all( + "Custom DocPerm", fields="*", filters={"parent": doctype}, order_by="name" + ) # also update the custom fields and property setters for all child tables for d in frappe.get_meta(doctype).get_table_fields():