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

Merge branch 'finbyz-develop' into develop

Browse Source
This commit is contained in:
Nabin Hait
2019-11-11 17:20:28 +05:30
parent 06c6f7cfd3 4c7ac65db1
commit f997b443e1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/crm/doctype/email_campaign/email_campaign.json
View File

@@ -52,7 +52,8 @@
"fieldtype": "Select", "fieldtype": "Select",
"in_list_view": 1, "in_list_view": 1,
"label": "Email Campaign For ", "label": "Email Campaign For ",
"options": "\nLead\nContact" "options": "\nLead\nContact",
"reqd": 1
}, },
{ {
"fieldname": "recipient", "fieldname": "recipient",
@@ -69,7 +70,7 @@
"options": "User" "options": "User"
} }
], ],
"modified": "2019-07-12 13:47:37.261213", "modified": "2019-11-11 17:18:47.342839",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Email Campaign", "name": "Email Campaign",

4
erpnext/crm/doctype/email_campaign/email_campaign.py
View File

@@ -73,13 +73,13 @@ def send_mail(entry, email_campaign):
email_template = frappe.get_doc("Email Template", entry.get("email_template")) email_template = frappe.get_doc("Email Template", entry.get("email_template"))
sender = frappe.db.get_value("User", email_campaign.get("sender"), 'email') sender = frappe.db.get_value("User", email_campaign.get("sender"), 'email')
context = {"doc": frappe.get_doc(email_campaign.email_campaign_for, email_campaign.recipient)}
# send mail and link communication to document # send mail and link communication to document
comm = make( comm = make(
doctype = "Email Campaign", doctype = "Email Campaign",
name = email_campaign.name, name = email_campaign.name,
subject = email_template.get("subject"), subject = email_template.get("subject"),
content = email_template.get("response"), content = frappe.render_template(email_template.get("response"), context),
sender = sender, sender = sender,
recipients = recipient, recipients = recipient,
communication_medium = "Email", communication_medium = "Email",