From 56c6a65a229d6fe01e1a3c563ec0a7c819bc766c Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 3 Mar 2015 14:51:34 +0530 Subject: [PATCH] argument name fix in sendmail --- erpnext/hr/doctype/salary_slip/salary_slip.py | 2 +- erpnext/setup/doctype/backup_manager/backup_manager.py | 2 +- erpnext/setup/doctype/email_digest/email_digest.py | 2 +- erpnext/stock/reorder_item.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 93154db4a0..dd544908ad 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -188,7 +188,7 @@ class SalarySlip(TransactionBase): receiver = frappe.db.get_value("Employee", self.employee, "company_email") if receiver: subj = 'Salary Slip - ' + cstr(self.month) +'/'+cstr(self.fiscal_year) - frappe.sendmail([receiver], subject=subj, msg = _("Please see attachment"), + frappe.sendmail([receiver], subject=subj, message = _("Please see attachment"), attachments=[frappe.attach_print(self.doctype, self.name, file_name=self.name)]) else: msgprint(_("Company Email ID not found, hence mail not sent")) diff --git a/erpnext/setup/doctype/backup_manager/backup_manager.py b/erpnext/setup/doctype/backup_manager/backup_manager.py index a8093caf73..4a38a6a089 100644 --- a/erpnext/setup/doctype/backup_manager/backup_manager.py +++ b/erpnext/setup/doctype/backup_manager/backup_manager.py @@ -75,4 +75,4 @@ def send_email(success, service_name, error_status=None): frappe.connect() recipients = frappe.db.get_value("Backup Manager", None, "send_notifications_to").split(",") - frappe.sendmail(recipients=recipients, subject=subject, msg=message) + frappe.sendmail(recipients=recipients, subject=subject, message=message) diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index 45bb373f51..15a3781a88 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -86,7 +86,7 @@ class EmailDigest(Document): frappe.sendmail(recipients=user_id, subject="[ERPNext] [{frequency} Digest] {name}".format( frequency=self.frequency, name=self.name), - msg=msg_for_this_receipient, bulk=True) + message=msg_for_this_receipient, bulk=True) def get_digest_msg(self): return self.get_msg_html(self.get_user_specific_content(frappe.session.user) + \ diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py index 6863763507..61abe3b49f 100644 --- a/erpnext/stock/reorder_item.py +++ b/erpnext/stock/reorder_item.py @@ -173,7 +173,8 @@ def send_email_notification(mr_list): msg += "" + item.item_code + "" + item.warehouse + "" + \ cstr(item.qty) + "" + cstr(item.uom) + "" msg += "" - frappe.sendmail(recipients=email_list, subject='Auto Material Request Generation Notification', msg = msg) + frappe.sendmail(recipients=email_list, + subject='Auto Material Request Generation Notification', message = msg) def notify_errors(exceptions_list): subject = "[Important] [ERPNext] Auto Reorder Errors"