nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-31 07:28:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Diptanil Saha
2026-08-15 19:42:06 +05:30
committed by GitHub
parent 77ff956556
commit 87fbbcffe5
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/setup/doctype/email_digest/email_digest.py
View File

@@ -903,14 +903,6 @@ def send():
ed_obj.send() ed_obj.send()
<<<<<<< HEAD
@frappe.whitelist()
def get_digest_msg(name):
return frappe.get_doc("Email Digest", name).get_msg_html()
=======
>>>>>>> 4cd8fbf1c0 (refactor(email_digest): convert `get_digest_msg` from module function to instance method (#58193))
def get_incomes_expenses_for_period(account, from_date, to_date): def get_incomes_expenses_for_period(account, from_date, to_date):
"""Get amounts for current and past periods""" """Get amounts for current and past periods"""