From 5663432bd838e7ef2673c7e4cede6f014a4fff1a Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Sun, 12 May 2024 23:01:19 +0200
Subject: [PATCH 1/2] fix: migrate lead notes

(cherry picked from commit 382d0ff45300fe6e92d1c535b8e6126d5e4057c3)
---
 .../migrate_existing_lead_notes_as_per_the_new_format.py    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/erpnext/patches/v14_0/migrate_existing_lead_notes_as_per_the_new_format.py b/erpnext/patches/v14_0/migrate_existing_lead_notes_as_per_the_new_format.py
index ec72527552c..d740a5b9c8e 100644
--- a/erpnext/patches/v14_0/migrate_existing_lead_notes_as_per_the_new_format.py
+++ b/erpnext/patches/v14_0/migrate_existing_lead_notes_as_per_the_new_format.py
@@ -9,15 +9,13 @@ def execute():
 
 		dt = frappe.qb.DocType(doctype)
 		records = (
-			frappe.qb.from_(dt)
-			.select(dt.name, dt.notes, dt.modified_by, dt.modified)
-			.where(dt.notes.isnotnull() & dt.notes != "")
+			frappe.qb.from_(dt).select(dt.name, dt.notes).where(dt.notes.isnotnull() & dt.notes != "")
 		).run(as_dict=True)
 
 		for d in records:
 			if strip_html(cstr(d.notes)).strip():
 				doc = frappe.get_doc(doctype, d.name)
-				doc.append("notes", {"note": d.notes, "added_by": d.modified_by, "added_on": d.modified})
+				doc.append("notes", {"note": d.notes})
 				doc.update_child_table("notes")
 
 		frappe.db.sql_ddl(f"alter table `tab{doctype}` drop column `notes`")

From 24ee765e6a3edc7a9e45c249e3ed1cc012cfb549 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 14 Jun 2024 17:47:02 +0200
Subject: [PATCH 2/2] fix: only show user and date if available

(cherry picked from commit 895aede5907cd949ae4d93521705e3144e31dfd5)
---
 erpnext/public/js/templates/crm_notes.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/erpnext/public/js/templates/crm_notes.html b/erpnext/public/js/templates/crm_notes.html
index 53df9330784..a20e6c2723c 100644
--- a/erpnext/public/js/templates/crm_notes.html
+++ b/erpnext/public/js/templates/crm_notes.html
@@ -12,6 +12,7 @@
 			{% for(var i=0, l=notes.length; i<l; i++) { %}
 				<div class="comment-content p-3 row" name="{{ notes[i].name }}">
 					<div class="mb-2 head col-xs-3">
+						{% if (notes[i].added_by && notes[i].added_on) %}
 						<div class="row">
 							<div class="col-xs-2">
 								{{ frappe.avatar(notes[i].added_by) }}
@@ -25,6 +26,7 @@
 								</div>
 							</div>
 						</div>
+						{% } %}
 					</div>
 					<div class="content col-xs-8">
 						{{ notes[i].note }}