From d472e17c7543edb2a9e643417345b1b2e176a4c3 Mon Sep 17 00:00:00 2001 From: Diptanil Saha Date: Sat, 15 Aug 2026 19:59:33 +0530 Subject: [PATCH] Revert "refactor(email_digest)!: convert `get_digest_msg` from module function to instance method" (#58196) --- .../doctype/email_digest/email_digest.js | 36 +++++++------------ .../doctype/email_digest/email_digest.py | 9 ++--- 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/erpnext/setup/doctype/email_digest/email_digest.js b/erpnext/setup/doctype/email_digest/email_digest.js index 1d5c9d2fa12..c0a887e4b11 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.js +++ b/erpnext/setup/doctype/email_digest/email_digest.js @@ -5,33 +5,23 @@ frappe.ui.form.on("Email Digest", { refresh: function (frm) { if (!frm.is_new()) { frm.add_custom_button(__("View Now"), function () { - if (frm.is_dirty()) { - frappe.show_alert({ - message: __("Save the Email Digest first.", "yellow"), - indicator: "yellow", - }); - return; - } - - frm.call("get_digest_msg").then((r) => { - let d = new frappe.ui.Dialog({ - title: __("Email Digest: {0}", [frm.doc.name]), - width: 800, - }); - $(d.body).html(r.message); - d.show(); + frappe.call({ + method: "erpnext.setup.doctype.email_digest.email_digest.get_digest_msg", + args: { + name: frm.doc.name, + }, + callback: function (r) { + let d = new frappe.ui.Dialog({ + title: __("Email Digest: {0}", [frm.doc.name]), + width: 800, + }); + $(d.body).html(r.message); + d.show(); + }, }); }); frm.add_custom_button(__("Send Now"), function () { - if (frm.is_dirty()) { - frappe.show_alert({ - message: __("Save the Email Digest first.", "yellow"), - indicator: "yellow", - }); - return; - } - return frm.call("send", null, () => { frappe.show_alert({ message: __("Message Sent"), indicator: "green" }); }); diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index d5eb87b3d4e..214ef288b03 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -944,10 +944,6 @@ class EmailDigest(Document): return items_by_parent - @frappe.whitelist() - def get_digest_msg(self): - return self.get_msg_html() - def send(): now_date = now_datetime().date() @@ -960,6 +956,11 @@ def send(): ed_obj.send() +@frappe.whitelist() +def get_digest_msg(name: str): + return frappe.get_doc("Email Digest", name).get_msg_html() + + def get_incomes_expenses_for_period(account, from_date, to_date): """Get amounts for current and past periods"""