From 468fb97c81694ca9fb11e3a56dbe0d99042a23a6 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Tue, 8 Aug 2017 17:27:58 +0530 Subject: [PATCH 1/3] [Fix] Lead address not able to select on the quotation (#10328) --- erpnext/selling/doctype/quotation/quotation.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js index b90f725bb2..c149742fe3 100644 --- a/erpnext/selling/doctype/quotation/quotation.js +++ b/erpnext/selling/doctype/quotation/quotation.js @@ -9,6 +9,15 @@ frappe.ui.form.on('Quotation', { frm.custom_make_buttons = { 'Sales Order': 'Make Sales Order' } + }, + refresh: function(frm) { + frm.trigger("set_label"); + }, + quotation_to: function(frm) { + frm.trigger("set_label"); + }, + set_label: function(frm) { + frm.fields_dict.customer_address.set_label(__(frm.doc.quotation_to + " Address")); } }); @@ -24,6 +33,8 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({ }, refresh: function(doc, dt, dn) { this._super(doc, dt, dn); + doctype = doc.quotation_to == 'Customer' ? 'Customer':'Lead'; + frappe.dynamic_link = {doc: this.frm.doc, fieldname: doctype.toLowerCase(), doctype: doctype} var me = this; From 60fcf47f6ae4eda585b0bf819d331ab5e5bf1544 Mon Sep 17 00:00:00 2001 From: Makarand Bauskar Date: Wed, 9 Aug 2017 11:15:18 +0530 Subject: [PATCH 2/3] [hotfix] changed the modified date for quotation (#10337) --- erpnext/selling/doctype/quotation/quotation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 16ea578764..ab3e8c9c21 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -2602,7 +2602,7 @@ "istable": 0, "max_attachments": 1, "menu_index": 0, - "modified": "2017-08-02 18:15:38.198698", + "modified": "2017-08-09 01:16:21.104135", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", From 3e29a28cee7b847f7b280cda03ec2495153e8467 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 9 Aug 2017 11:47:55 +0600 Subject: [PATCH 3/3] bumped to version 8.8.1 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 93f4961000..d6fa3f82cf 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -4,7 +4,7 @@ import inspect import frappe from erpnext.hooks import regional_overrides -__version__ = '8.8.0' +__version__ = '8.8.1' def get_default_company(user=None): '''Get default company for user'''