diff --git a/erpnext/controllers/recurring_document.py b/erpnext/controllers/recurring_document.py index fa7f275309..1ec415ce07 100644 --- a/erpnext/controllers/recurring_document.py +++ b/erpnext/controllers/recurring_document.py @@ -124,10 +124,7 @@ def send_notification(new_rv): frappe.sendmail(new_rv.notification_email_address, subject= _("New {0}: #{1}").format(new_rv.doctype, new_rv.name), message = _("Please find attached {0} #{1}").format(new_rv.doctype, new_rv.name), - attachments = [{ - "fname": new_rv.name + ".pdf", - "fcontent": frappe.get_print_format(new_rv.doctype, new_rv.name, as_pdf=True) - }]) + attachments = [frappe.attach_print(new_rv.doctype, new_rv.name, file_name=new_rv.name)]) def notify_errors(doc, doctype, party, owner): from frappe.utils.user import get_system_managers diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index f30fe02fa9..f87a122ca2 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -191,9 +191,6 @@ class SalarySlip(TransactionBase): if receiver: subj = 'Salary Slip - ' + cstr(self.month) +'/'+cstr(self.fiscal_year) sendmail([receiver], subject=subj, msg = _("Please see attachment"), - attachments=[{ - "fname": self.name + ".pdf", - "fcontent": frappe.get_print_format(self.doctype, self.name, as_pdf = True) - }]) + attachments=[frappe.attach_print(self.doctype, self.name, file_name=self.name)]) else: msgprint(_("Company Email ID not found, hence mail not sent"))