nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Gursheen Kaur Anand
2023-09-11 11:25:30 +05:30
committed by GitHub
parent 284181d766
commit 619644af04
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
View File

@@ -378,13 +378,9 @@ def send_emails(document_name, from_scheduler=False, posting_date=None):
attachments = [{"fname": filename + ".pdf", "fcontent": report_pdf}] attachments = [{"fname": filename + ".pdf", "fcontent": report_pdf}]
recipients, cc = get_recipients_and_cc(customer, doc) recipients, cc = get_recipients_and_cc(customer, doc)
<<<<<<< HEAD
context = get_context(customer, doc)
=======
if not recipients: if not recipients:
continue continue
>>>>>>> 5c2a949593 (feat: add field for specifying pdf name)
subject = frappe.render_template(doc.subject, context) subject = frappe.render_template(doc.subject, context)
message = frappe.render_template(doc.body, context) message = frappe.render_template(doc.body, context)