diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 8b13b00c042..5db9c30135a 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -60,7 +60,7 @@ body: description: Share exact version number of Frappe and ERPNext you are using. placeholder: | Frappe version - - ERPNext Verion - + ERPNext version - validations: required: true 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 b2f8a1ed1e5..95727472112 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -304,12 +304,17 @@ class RequestforQuotation(BuyingController): else: sender = frappe.session.user not in STANDARD_USERS and frappe.session.user or None + rendered_message = frappe.render_template(self.message_for_supplier, doc_args) + subject_source = ( + self.subject + or frappe.get_value("Email Template", self.email_template, "subject") + or _("Request for Quotation") + ) + rendered_subject = frappe.render_template(subject_source, doc_args) if preview: return { - "message": self.message_for_supplier, - "subject": self.subject - or frappe.get_value("Email Template", self.email_template, "subject") - or _("Request for Quotation"), + "message": rendered_message, + "subject": rendered_subject, } attachments = [] @@ -333,10 +338,8 @@ class RequestforQuotation(BuyingController): self.send_email( data, sender, - self.subject - or frappe.get_value("Email Template", self.email_template, "subject") - or _("Request for Quotation"), - self.message_for_supplier, + rendered_subject, + rendered_message, attachments, )