vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Show all recipients in sent-to message

Browse source
This commit is contained in:
Nabin Hait 2015-06-18 16:51:50 +05:30
parent 53e8845f9b
commit da2c7c8683
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
frappe/core/doctype/communication/communication.py
View file

@ -44,14 +44,14 @@ class Communication(Document):
frappe.db.set_value(parent.doctype, parent.name, "status", to_status)
def send(self, print_html=None, print_format=None, attachments=None,
send_me_a_copy=False):
send_me_a_copy=False, recipients=None):
"""Send communication via Email.
:param print_html: Send given value as HTML attachment.
:param print_format: Attach print format of parent document."""
self.send_me_a_copy = send_me_a_copy
self.notify(print_html, print_format, attachments)
self.notify(print_html, print_format, attachments, recipients)
def set_incoming_outgoing_accounts(self):
self.incoming_email_account = self.outgoing_email_account = None
@ -71,9 +71,10 @@ class Communication(Document):
self.outgoing_email_account = frappe.db.get_value("Email Account", {"default_outgoing": 1},
["email_id", "always_use_account_email_id_as_sender"], as_dict=True) or frappe._dict()
def notify(self, print_html=None, print_format=None, attachments=None, except_recipient=False):
def notify(self, print_html=None, print_format=None, attachments=None, except_recipient=False, recipients=None):
self.prepare_to_notify(print_html, print_format, attachments)
recipients = self.get_recipients(except_recipient=except_recipient)
if not recipients:
recipients = self.get_recipients(except_recipient=except_recipient)
frappe.sendmail(
recipients=recipients,
@ -246,11 +247,14 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
"reference_name": name
})
comm.insert(ignore_permissions=True)
recipients = None
if send_email:
comm.send(print_html, print_format, attachments, send_me_a_copy=send_me_a_copy)
comm.send_me_a_copy = send_me_a_copy
recipients = comm.get_recipients()
comm.send(print_html, print_format, attachments, send_me_a_copy=send_me_a_copy, recipients=recipients)
return comm.name
return ", ".join(recipients) if recipients else None
@frappe.whitelist()
def get_convert_to():

2
frappe/public/js/frappe/views/communication.js
View file

@ -328,7 +328,7 @@ frappe.views.CommunicationComposer = Class.extend({
callback: function(r) {
if(!r.exc) {
if(form_values.send_email)
msgprint(__("Email sent to {0}", [form_values.recipients]));
msgprint(__("Email sent to {0}", [r.message]));
me.dialog.hide();
if (cur_frm) {