From 87d5710956bc4f8a861d953cdd52da573e868593 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 25 Mar 2019 19:39:20 +0530 Subject: [PATCH] fix: Move doctype patch to top (#7129) - This fixes the ERPNext patch --- frappe/patches.txt | 2 +- .../v12_0/remove_deprecated_fields_from_doctype.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index 1498033b44..4483bdea53 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -1,3 +1,4 @@ +frappe.patches.v12_0.remove_deprecated_fields_from_doctype #2 execute:frappe.db.sql("""update `tabPatch Log` set patch=replace(patch, '.4_0.', '.v4_0.')""") #2014-05-12 frappe.patches.v5_0.convert_to_barracuda_and_utf8mb4 execute:frappe.utils.global_search.setup_global_search_table() @@ -237,4 +238,3 @@ frappe.patches.v11_0.set_default_letter_head_source frappe.patches.v12_0.setup_comments_from_communications frappe.patches.v12_0.init_desk_settings #11-03-2019 frappe.patches.v12_0.replace_null_values_in_tables -frappe.patches.v12_0.remove_deprecated_fields_from_doctype #1 diff --git a/frappe/patches/v12_0/remove_deprecated_fields_from_doctype.py b/frappe/patches/v12_0/remove_deprecated_fields_from_doctype.py index 0fa36c0494..bd43cc74d7 100644 --- a/frappe/patches/v12_0/remove_deprecated_fields_from_doctype.py +++ b/frappe/patches/v12_0/remove_deprecated_fields_from_doctype.py @@ -2,9 +2,6 @@ import frappe def execute(): frappe.reload_doc('core', 'doctype', 'doctype') - frappe.db.sql(''' - ALTER TABLE tabDocType - DROP COLUMN IF EXISTS hide_heading, - DROP COLUMN IF EXISTS image_view, - DROP COLUMN IF EXISTS read_only_onload - ''') + frappe.model.delete_fields({ + 'DocType': ['hide_heading', 'image_view', 'read_only_onload'] + }, delete=1)