From 0404941fb2925f585c94015ae573a88f043ca75c Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 9 May 2024 12:21:29 +0530 Subject: [PATCH] chore: resolve conflict --- erpnext/selling/doctype/quotation/quotation.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js index 1dc6e7f27da..d2f565ef70e 100644 --- a/erpnext/selling/doctype/quotation/quotation.js +++ b/erpnext/selling/doctype/quotation/quotation.js @@ -72,17 +72,8 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext. super.refresh(doc, dt, dn); frappe.dynamic_link = { doc: this.frm.doc, -<<<<<<< HEAD fieldname: 'party_name', - doctype: doc.quotation_to == 'Customer' ? 'Customer' : 'Lead', -======= - fieldname: "party_name", -<<<<<<< HEAD - doctype: doctype, ->>>>>>> fe5b88522e (fix: address filter and quotation to for prospect) -======= doctype: doc.quotation_to, ->>>>>>> 754c7f6d1c (refactor: make use of doc.quotation_to) }; var me = this;