CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-22 11:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(RFQ): make sending attachments configurable (backport #36359) (#36535)

Browse Source 
* feat(RFQ): make sending attachments configurable (#36359)

(cherry picked from commit 8cc3df7c2c)

# Conflicts:
#	erpnext/buying/doctype/request_for_quotation/request_for_quotation.json

* chore: resolve conflicts

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
This commit is contained in:
mergify[bot]
2023-08-07 21:17:12 +05:30
committed by GitHub
parent 9c108a8ef7
commit 5881960001
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
View File

@@ -25,6 +25,7 @@
"col_break_email_1", "col_break_email_1",
"email_template", "email_template",
"preview", "preview",
"send_attached_files",
"sec_break_email_2", "sec_break_email_2",
"message_for_supplier", "message_for_supplier",
"terms_section_break", "terms_section_break",
@@ -285,13 +286,20 @@
"fieldname": "named_place", "fieldname": "named_place",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Named Place" "label": "Named Place"
},
{
"default": "1",
"description": "If enabled, all files attached to this document will be attached to each email",
"fieldname": "send_attached_files",
"fieldtype": "Check",
"label": "Send Attached Files"
} }
], ],
"icon": "fa fa-shopping-cart", "icon": "fa fa-shopping-cart",
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2023-01-31 23:22:06.684694", "modified": "2023-07-27 16:41:48.468873",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Request for Quotation", "name": "Request for Quotation",

4
erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
View File

@@ -209,7 +209,9 @@ class RequestforQuotation(BuyingController):
if preview: if preview:
return message return message
attachments = self.get_attachments() attachments = None
if self.send_attached_files:
attachments = self.get_attachments()
self.send_email(data, sender, subject, message, attachments) self.send_email(data, sender, subject, message, attachments)