diff --git a/frappe/patches.txt b/frappe/patches.txt index 928ea2d8fc..65220ee4d7 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -104,8 +104,6 @@ frappe.patches.v4_3.remove_allow_on_submit_customization frappe.patches.v5_0.rename_table_fieldnames frappe.patches.v5_0.communication_parent frappe.patches.v5_0.clear_website_group_and_notifications -execute:frappe.db.sql("""update tabComment set comment = substr(comment, 6, locate(":", comment)-6) where comment_type in ("Assigned", "Assignment Completed")""") -execute:frappe.db.sql("update `tabComment` set comment_type='Comment' where comment_doctype='Blog Post' and ifnull(comment_type, '')=''") frappe.patches.v5_0.update_shared execute:frappe.reload_doc("core", "doctype", "docshare") #2015-07-21 frappe.patches.v6_19.comment_feed_communication @@ -232,4 +230,5 @@ execute:frappe.delete_doc('Page', 'applications', ignore_missing=True) frappe.patches.v11_0.set_missing_creation_and_modified_value_for_user_permissions frappe.patches.v12_0.set_primary_key_in_series execute:frappe.delete_doc("Page", "modules", ignore_missing=True) -frappe.patches.v11_0.set_default_letter_head_source \ No newline at end of file +frappe.patches.v11_0.set_default_letter_head_source +frappe.patches.v12_0.setup_comments_from_communications \ No newline at end of file diff --git a/frappe/patches/v6_19/comment_feed_communication.py b/frappe/patches/v6_19/comment_feed_communication.py index 6f91ba04f9..a7503c08ab 100644 --- a/frappe/patches/v6_19/comment_feed_communication.py +++ b/frappe/patches/v6_19/comment_feed_communication.py @@ -6,6 +6,9 @@ from frappe.model.dynamic_links import dynamic_link_queries from frappe.permissions import reset_perms def execute(): + # comments stay comments in v12 + return + frappe.reload_doctype("DocType") frappe.reload_doctype("Communication") reset_perms("Communication")