frappe · sokumon · May 23, 2025 · Apr 21, 2025 · Apr 21, 2025 · May 21, 2025
diff --git a/frappe/desk/doctype/note/note.py b/frappe/desk/doctype/note/note.py
@@ -4,6 +4,8 @@
 import frappe
 from frappe.model.document import Document
 
+UNSEEN_NOTES_KEY = "unseen_notes::"
+
 
 class Note(Document):
 	# begin: auto-generated types
@@ -62,3 +64,40 @@ def get_permission_query_conditions(user):
 
 def has_permission(doc, user):
 	return doc.public or doc.owner == user
+
+
+def get_unseen_notes():
+	return (
+		frappe.cache.get_value(
+			f"{UNSEEN_NOTES_KEY}{frappe.session.user}",
+		)
+		or []
+	)
+
+
+@frappe.whitelist()
+def reset_notes():
+	frappe.cache.set_value(f"{UNSEEN_NOTES_KEY}{frappe.session.user}", [])
+	return frappe.cache.get_value(f"{UNSEEN_NOTES_KEY}{frappe.session.user}")
+
+
+def _get_unseen_notes():
+	from frappe.query_builder.terms import ParameterizedValueWrapper, SubQuery
+
+	note = frappe.qb.DocType("Note")
+	nsb = frappe.qb.DocType("Note Seen By").as_("nsb")
+
+	results = (
+		frappe.qb.from_(note)
+		.select(note.name, note.title, note.content, note.notify_on_every_login)
+		.where(
+			(note.notify_on_login == 1)
+			& (note.expire_notification_on > frappe.utils.now())
+			& (
+				ParameterizedValueWrapper(frappe.session.user).notin(
+					SubQuery(frappe.qb.from_(nsb).select(nsb.user).where(nsb.parent == note.name))
+				)
+			)
+		)
+	).run(as_dict=1)
+	frappe.cache.set_value(f"{UNSEEN_NOTES_KEY}{frappe.session.user}", results)
diff --git a/frappe/hooks.py b/frappe/hooks.py
@@ -86,6 +86,7 @@
 	"frappe.core.doctype.user.user.notify_admin_access_to_system_manager",
 ]
 
+on_login = "frappe.desk.doctype.note.note._get_unseen_notes"
 on_logout = "frappe.core.doctype.session_default_settings.session_default_settings.clear_session_defaults"
 
 # PDF

diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
@@ -453,11 +453,12 @@ frappe.Application = class Application {
 		if (frappe.boot.notes.length) {
 			frappe.boot.notes.forEach(function (note) {
 				if (!note.seen || note.notify_on_every_login) {
-					var d = frappe.msgprint({ message: note.content, title: note.title });
+					var d = new frappe.ui.Dialog({ content: note.content, title: note.title });
 					d.keep_open = true;
-					d.custom_onhide = function () {
+					d.msg_area = $('<div class="msgprint">').appendTo(d.body);
+					d.msg_area.append(note.content);
+					d. () {
 						note.seen = true;
-
 						// Mark note as read if the Notify On Every Login flag is not set
 						if (!note.notify_on_every_login) {
 							frappe.call({
@@ -466,11 +467,13 @@ frappe.Application = class Application {
 									note: note.name,
 								},
 							});
+						} else {
+							frappe.call({
+								method: "frappe.desk.doctype.note.note.reset_notes",
+							});
 						}
-
-						// next note
-						me.show_notes();
 					};
+					d.show();
 				}
 			});
 		}

diff --git a/frappe/tests/test_boot.py b/frappe/tests/test_boot.py
@@ -1,6 +1,6 @@
 import frappe
 from frappe.boot import get_unseen_notes, get_user_pages_or_reports
-from frappe.desk.doctype.note.note import mark_as_seen
+from frappe.desk.doctype.note.note import _get_unseen_notes, mark_as_seen
 from frappe.tests.utils import FrappeTestCase
 
 
@@ -20,6 +20,7 @@ def test_get_unseen_notes(self):
 		note.insert()
 
 		frappe.set_user("test@example.com")
+		_get_unseen_notes()
 		unseen_notes = [d.title for d in get_unseen_notes()]
 		self.assertListEqual(unseen_notes, ["Test Note"])
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,6 +86,7 @@ @@
     	"frappe.core.doctype.user.user.notify_admin_access_to_system_manager",
     ]
+    on_login = "frappe.desk.doctype.note.note._get_unseen_notes"
     on_logout = "frappe.core.doctype.session_default_settings.session_default_settings.clear_session_defaults"
     # PDF
@@ Expand Down @@