From d5fcab5f8197325c775eebd3a24ead49713f8a25 Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 15 Jul 2019 12:44:11 +0530 Subject: [PATCH 1/2] fix: Set taxes fix for lead --- erpnext/public/js/utils/party.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js index 35185c90b6..a8d3888ba0 100644 --- a/erpnext/public/js/utils/party.js +++ b/erpnext/public/js/utils/party.js @@ -145,7 +145,7 @@ erpnext.utils.set_taxes_from_address = function(frm, triggered_from_field, billi erpnext.utils.set_taxes = function(frm, triggered_from_field) { if(frappe.meta.get_docfield(frm.doc.doctype, "taxes")) { if(!erpnext.utils.validate_mandatory(frm, "Lead/Customer/Supplier", - frm.doc.customer || frm.doc.supplier || frm.doc.lead, triggered_from_field)) { + frm.doc.customer || frm.doc.supplier || frm.doc.lead || frm.doc.party_name, triggered_from_field)) { return; } From eac54612296dc3cd02dc5711dc24fa1bfb11bcce Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Mon, 15 Jul 2019 13:55:08 +0530 Subject: [PATCH 2/2] fix: Address filtering fix in opportunity --- erpnext/crm/doctype/opportunity/opportunity.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js index 9dcd0c493a..90a12b7dbd 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.js +++ b/erpnext/crm/doctype/opportunity/opportunity.js @@ -19,6 +19,10 @@ frappe.ui.form.on("Opportunity", { } } }); + + if (frm.doc.opportunity_from && frm.doc.party_name){ + frm.trigger('set_contact_link'); + } }, onload_post_render: function(frm) {