diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
index 46327574f7..880a4cdf42 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -213,7 +213,8 @@ frappe.ui.form.on("Request for Quotation",{
label: __('Subject'),
fieldtype: 'Data',
fieldname: 'subject',
- read_only: 1
+ read_only: 1,
+ depends_on: 'subject'
},
{
fieldtype: 'Section Break',
@@ -229,12 +230,8 @@ frappe.ui.form.on("Request for Quotation",{
});
dialog.fields_dict['supplier'].df.onchange = () => {
- var args = {
- 'supplier' : dialog.get_value('supplier'),
- 'salutation' : frm.doc.salutation || null,
- 'message' : frm.doc.message_for_supplier
- }
- frm.call('get_supplier_email_preview', args).then(result => {
+ var supplier = dialog.get_value('supplier');
+ frm.call('get_supplier_email_preview', {supplier: supplier}).then(result => {
dialog.fields_dict.email_preview.$wrapper.empty();
dialog.fields_dict.email_preview.$wrapper.append(result.message);
});
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
index 715556c204..7e5650f670 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -245,14 +245,17 @@
"fetch_if_empty": 1,
"fieldname": "subject",
"fieldtype": "Data",
- "label": "Subject"
+ "label": "Subject",
+ "print_hide": 1
},
{
"description": "Select a greeting for the receiver. E.g. Mr., Ms., etc.",
"fieldname": "salutation",
"fieldtype": "Link",
"label": "Salutation",
- "options": "Salutation"
+ "no_copy": 1,
+ "options": "Salutation",
+ "print_hide": 1
},
{
"fieldname": "col_break_email_1",
@@ -273,7 +276,7 @@
"icon": "fa fa-shopping-cart",
"is_submittable": 1,
"links": [],
- "modified": "2020-09-28 14:25:31.357817",
+ "modified": "2020-09-28 17:37:10.313350",
"modified_by": "Administrator",
"module": "Buying",
"name": "Request for Quotation",
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index c3f69d7b05..5c9b91eea4 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -62,29 +62,15 @@ class RequestforQuotation(BuyingController):
def on_cancel(self):
frappe.db.set(self, 'status', 'Cancelled')
- def get_supplier_email_preview(self, args):
- rfq_suppliers = list(filter(lambda row: row.supplier == args.get('supplier'), self.suppliers))
- rfq_supplier = rfq_suppliers[0].as_dict()
+ def get_supplier_email_preview(self, supplier):
+ # Returns formatted email preview as string
+ rfq_suppliers = list(filter(lambda row: row.supplier == supplier, self.suppliers))
+ rfq_supplier = rfq_suppliers[0]
update_password_link = self.update_supplier_contact(rfq_supplier, self.get_link())
- full_name = get_user_fullname(frappe.session['user'])
- if full_name == "Guest":
- full_name = "Administrator"
+ message = self.supplier_rfq_mail(rfq_supplier, update_password_link, self.get_link(), True)
- args = {
- 'update_password_link': update_password_link,
- 'message': frappe.render_template(self.message_for_supplier, args),
- 'rfq_link': self.get_link(),
- 'user_fullname': full_name,
- 'supplier': rfq_supplier.supplier_name,
- 'salutation': args.get('salutation')
- }
- args.update(self.as_dict())
-
- subject = _("Request for Quotation")
- template = "templates/emails/request_for_quotation.html"
- message = frappe.get_template(template).render(args)
return message
def send_to_supplier(self):
@@ -154,7 +140,7 @@ class RequestforQuotation(BuyingController):
return user, update_password_link
- def supplier_rfq_mail(self, data, update_password_link, rfq_link):
+ def supplier_rfq_mail(self, data, update_password_link, rfq_link, preview=False):
full_name = get_user_fullname(frappe.session['user'])
if full_name == "Guest":
full_name = "Administrator"
@@ -163,13 +149,19 @@ class RequestforQuotation(BuyingController):
'update_password_link': update_password_link,
'message': frappe.render_template(self.message_for_supplier, data.as_dict()),
'rfq_link': rfq_link,
- 'user_fullname': full_name
+ 'user_fullname': full_name,
+ 'supplier_name' : data.get('supplier_name'),
+ 'supplier_salutation' : self.salutation or 'Dear Mx.',
}
- subject = _("Request for Quotation")
+ subject = self.subject or _("Request for Quotation")
template = "templates/emails/request_for_quotation.html"
sender = frappe.session.user not in STANDARD_USERS and frappe.session.user or None
message = frappe.get_template(template).render(args)
+
+ if preview:
+ return message
+
attachments = self.get_attachments()
self.send_email(data, sender, subject, message, attachments)
diff --git a/erpnext/templates/emails/request_for_quotation.html b/erpnext/templates/emails/request_for_quotation.html
index 414dd0f742..216bd81d35 100644
--- a/erpnext/templates/emails/request_for_quotation.html
+++ b/erpnext/templates/emails/request_for_quotation.html
@@ -1,11 +1,11 @@
{{_("Request for Quotation")}}
-{{_("Dear")}} {{ salutation if salutation else ''}} {{ supplier }},
+{{ supplier_salutation if supplier_salutation else ''}} {{ supplier_name }},
{{ message }}
-{{_("The request for quotation can be accessed by clicking on the following link")}}:
+{{_("The Request for Quotation can be accessed by clicking on the following button")}}:
@@ -14,10 +14,10 @@
{% if update_password_link %}