Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

argument name fix in sendmail

Browse Source
This commit is contained in:
Nabin Hait 2015-03-03 14:51:34 +05:30
parent fcda00f317
commit 56c6a65a22
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@ -188,7 +188,7 @@ class SalarySlip(TransactionBase):
receiver = frappe.db.get_value("Employee", self.employee, "company_email") receiver = frappe.db.get_value("Employee", self.employee, "company_email")
if receiver: if receiver:
subj = 'Salary Slip - ' + cstr(self.month) +'/'+cstr(self.fiscal_year) 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)]) attachments=[frappe.attach_print(self.doctype, self.name, file_name=self.name)])
else: else:
msgprint(_("Company Email ID not found, hence mail not sent")) msgprint(_("Company Email ID not found, hence mail not sent"))

2
erpnext/setup/doctype/backup_manager/backup_manager.py
View File

@ -75,4 +75,4 @@ def send_email(success, service_name, error_status=None):
frappe.connect() frappe.connect()
recipients = frappe.db.get_value("Backup Manager", None, "send_notifications_to").split(",") 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)

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

@ -86,7 +86,7 @@ class EmailDigest(Document):
frappe.sendmail(recipients=user_id, frappe.sendmail(recipients=user_id,
subject="[ERPNext] [{frequency} Digest] {name}".format( subject="[ERPNext] [{frequency} Digest] {name}".format(
frequency=self.frequency, name=self.name), 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): def get_digest_msg(self):
return self.get_msg_html(self.get_user_specific_content(frappe.session.user) + \ return self.get_msg_html(self.get_user_specific_content(frappe.session.user) + \

3
erpnext/stock/reorder_item.py
View File

@ -173,7 +173,8 @@ def send_email_notification(mr_list):
msg += "<tr><td>" + item.item_code + "</td><td>" + item.warehouse + "</td><td>" + \ msg += "<tr><td>" + item.item_code + "</td><td>" + item.warehouse + "</td><td>" + \
cstr(item.qty) + "</td><td>" + cstr(item.uom) + "</td></tr>" cstr(item.qty) + "</td><td>" + cstr(item.uom) + "</td></tr>"
msg += "</table>" msg += "</table>"
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): def notify_errors(exceptions_list):
subject = "[Important] [ERPNext] Auto Reorder Errors" subject = "[Important] [ERPNext] Auto Reorder Errors"