(cherry picked from commit c2bda2c705)
# Conflicts:
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
(cherry picked from commit c2bda2c705)
# Conflicts:
# erpnext/buying/doctype/supplier_quotation/supplier_quotation.json