From f8e614f0c71a008e083794309da7767fa947a3b0 Mon Sep 17 00:00:00 2001 From: Sudharsanan11 Date: Tue, 25 Aug 2026 11:47:06 +0530 Subject: [PATCH] fix: fix conflicts --- .../request_for_quotation.py | 15 --------------- 1 file changed, 15 deletions(-) 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 80466feba4d..4483ce7c79a 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py @@ -494,20 +494,6 @@ def create_supplier_quotation(doc: str | Document | dict): if frappe.session.user not in frappe.get_all("Portal User", {"parent": supplier}, pluck="user"): frappe.throw(_("Not Permitted"), frappe.PermissionError) -<<<<<<< HEAD - try: - sq_doc = frappe.get_doc( - { - "doctype": "Supplier Quotation", - "supplier": doc.get("supplier"), - "terms": doc.get("terms"), - "company": doc.get("company"), - "currency": doc.get("currency") - or get_party_account_currency("Supplier", doc.get("supplier"), doc.get("company")), - "buying_price_list": doc.get("buying_price_list") - or frappe.db.get_value("Buying Settings", None, "buying_price_list"), - } -======= validate_existing_supplier_quotation(supplier, doc.get("items")) sq_doc = frappe.get_doc( @@ -566,7 +552,6 @@ def validate_existing_supplier_quotation(supplier, items): frappe.bold(existing_quotation.name), frappe.bold(existing_quotation.request_for_quotation), ) ->>>>>>> 39e15c7b2d (fix: prevent duplicate supplier quotations from portal) )