From 1067ef6ef2d7d90709fc73841f14cfa75ff3ad3a Mon Sep 17 00:00:00 2001 From: vama Date: Wed, 15 Sep 2021 11:07:36 +0530 Subject: [PATCH] fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) (#27499) * fix: Tags getting fetched correctly in Get Supplier in RFQ( Request For Quotation ) #26343 * fix: Linting issues * fix: remove unnecessary caching [skip ci] Co-authored-by: Vama Mehta Co-authored-by: Ankush Menat (cherry picked from commit 50fe23308acad58ab2db2056ea6dd163913725ef) # Conflicts: # erpnext/buying/doctype/request_for_quotation/request_for_quotation.py --- .../doctype/request_for_quotation/request_for_quotation.py | 5 +++++ 1 file changed, 5 insertions(+) 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 ee6c7a89cae..014f188d04d 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -560,9 +560,14 @@ def get_item_from_material_requests_based_on_supplier(source_name, target_doc=No def get_supplier_tag(): filters = {"document_type": "Supplier"} tags = list(set(tag.tag for tag in frappe.get_all("Tag Link", filters=filters, fields=["tag"]) if tag)) +<<<<<<< HEAD return tags +======= + + return tags +>>>>>>> 50fe23308a (fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) (#27499)) @frappe.whitelist() @frappe.validate_and_sanitize_search_inputs