From b8c2e02c6722de41843d0fd28a664405836385ef Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Tue, 7 May 2019 17:17:27 +0530 Subject: [PATCH 1/2] fix: address not set on the quotation from the lead --- erpnext/accounts/party.py | 4 ++-- erpnext/public/js/utils/party.js | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 67bd0bd8c70..240dc4255b9 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -44,7 +44,7 @@ def _get_party_details(party=None, account=None, party_type="Customer", company= frappe.throw(_("Not permitted for {0}").format(party), frappe.PermissionError) party = frappe.get_doc(party_type, party) - currency = party.default_currency if party.default_currency else get_company_currency(company) + currency = party.default_currency if party.get("default_currency") else get_company_currency(company) out["taxes_and_charges"] = set_taxes(party.name, party_type, posting_date, company, out.customer_group, out.supplier_group) out["payment_terms_template"] = get_pyt_term_template(party.name, party_type, company) @@ -140,7 +140,7 @@ def set_other_values(out, party, party_type): def get_default_price_list(party): """Return default price list for party (Document object)""" - if party.default_price_list: + if party.get("default_price_list"): return party.default_price_list if party.doctype == "Customer": diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js index 6aad29183fc..52657edd173 100644 --- a/erpnext/public/js/utils/party.js +++ b/erpnext/public/js/utils/party.js @@ -10,9 +10,15 @@ erpnext.utils.get_party_details = function(frm, method, args, callback) { if(!args) { if((frm.doctype != "Purchase Order" && frm.doc.customer) || (frm.doc.party_name && in_list(['Quotation', 'Opportunity'], frm.doc.doctype))) { + + let party_type = "Customer"; + if(frm.doc.quotation_to && frm.doc.quotation_to === "Lead") { + party_type = "Lead"; + } + args = { party: frm.doc.customer || frm.doc.party_name, - party_type: "Customer", + party_type: party_type, price_list: frm.doc.selling_price_list }; } else if(frm.doc.supplier) { From f4f2301e5b9d8c1152375d1511489fd5e1370bbe Mon Sep 17 00:00:00 2001 From: Sahil Khan Date: Tue, 7 May 2019 18:15:28 +0550 Subject: [PATCH 2/2] bumped to version 11.1.27 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 6bd3a6ad416..39721c9fc04 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '11.1.26' +__version__ = '11.1.27' def get_default_company(user=None): '''Get default company for user'''