nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-05-09 12:21:29 +05:30
parent c4dfcbec96
commit 0404941fb2
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/selling/doctype/quotation/quotation.js
View File

@@ -72,17 +72,8 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
super.refresh(doc, dt, dn); super.refresh(doc, dt, dn);
frappe.dynamic_link = { frappe.dynamic_link = {
doc: this.frm.doc, doc: this.frm.doc,
<<<<<<< HEAD
fieldname: 'party_name', 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, doctype: doc.quotation_to,
>>>>>>> 754c7f6d1c (refactor: make use of doc.quotation_to)
}; };
var me = this; var me = this;