Merge branch 'hotfix'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 93f4961..d6fa3f8 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -4,7 +4,7 @@
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'''
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index b90f725..c149742 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -9,6 +9,15 @@
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 @@
},
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;
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 16ea578..ab3e8c9 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",