nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 07:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: address filter and quotation to for prospect

Browse Source 
(cherry picked from commit fe5b88522e)
This commit is contained in:
Nihantra Patel
2024-04-16 18:06:42 +05:30
committed by Mergify
parent 307e394da4
commit cdbb515379
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/party.py
View File

@@ -188,7 +188,7 @@ def set_address_details(
*, *,
ignore_permissions=False, ignore_permissions=False,
): ):
billing_address_field = "customer_address" if party_type == "Lead" else party_type.lower() + "_address" billing_address_field = "customer_address" if party_type in ["Lead", "Prospect"] else party_type.lower() + "_address"
party_details[billing_address_field] = party_address or get_default_address(party_type, party.name) party_details[billing_address_field] = party_address or get_default_address(party_type, party.name)
if doctype: if doctype:
party_details.update( party_details.update(

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

@@ -71,6 +71,8 @@ frappe.ui.form.on("Quotation", {
frm.trigger("set_label"); frm.trigger("set_label");
frm.trigger("toggle_reqd_lead_customer"); frm.trigger("toggle_reqd_lead_customer");
frm.trigger("set_dynamic_field_label"); frm.trigger("set_dynamic_field_label");
frm.set_value("party_name", '')
frm.set_value("customer_name", '')
}, },
set_label: function (frm) { set_label: function (frm) {
@@ -94,10 +96,18 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
} }
refresh(doc, dt, dn) { refresh(doc, dt, dn) {
super.refresh(doc, dt, dn); super.refresh(doc, dt, dn);
let doctype = "";
if (doc.quotation_to == "Customer") {
doctype = "Customer";
} else if (doc.quotation_to == "Lead") {
doctype = "Lead";
} else if (doc.quotation_to == "Prospect") {
doctype = "Prospect";
}
frappe.dynamic_link = { frappe.dynamic_link = {
doc: this.frm.doc, doc: this.frm.doc,
fieldname: "party_name", fieldname: "party_name",
doctype: doc.quotation_to == "Customer" ? "Customer" : "Lead", doctype: doctype,
}; };
var me = this; var me = this;
@@ -197,6 +207,7 @@ erpnext.selling.QuotationController = class QuotationController extends erpnext.
}; };
} else if (this.frm.doc.quotation_to == "Prospect") { } else if (this.frm.doc.quotation_to == "Prospect") {
this.frm.set_df_property("party_name", "label", "Prospect"); this.frm.set_df_property("party_name", "label", "Prospect");
this.frm.fields_dict.party_name.get_query = null;
} }
} }