Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index edf498b..5abd582 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.7.3'
+__version__ = '6.7.4'
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 7a4ea90..646dfbf 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -12,6 +12,7 @@
if(doc.__islocal){
hide_field(['address_html','contact_html']);
+ erpnext.utils.clear_address_and_contact(cur_frm);
}
else{
unhide_field(['address_html','contact_html']);
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index e9b07fe..1dc8eb2 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -37,6 +37,8 @@
if(!this.frm.doc.__islocal) {
erpnext.utils.render_address_and_contact(cur_frm);
+ } else {
+ erpnext.utils.clear_address_and_contact(cur_frm);
}
},
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 6f6e07a..b459fb1 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -29,7 +29,7 @@
"""
app_icon = "icon-th"
app_color = "#e74c3c"
-app_version = "6.7.3"
+app_version = "6.7.4"
source_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com"
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 7f69202..c0549ba 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -100,6 +100,11 @@
$.extend(erpnext.utils, {
+ clear_address_and_contact: function(frm) {
+ $(frm.fields_dict['address_html'].wrapper).html("");
+ frm.fields_dict['contact_html'] && $(frm.fields_dict['contact_html'].wrapper).html("");
+ },
+
render_address_and_contact: function(frm) {
// render address
$(frm.fields_dict['address_html'].wrapper)
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 42cc93a..4cd5cc7 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -14,6 +14,8 @@
if(!frm.doc.__islocal) {
erpnext.utils.render_address_and_contact(frm);
+ } else {
+ erpnext.utils.clear_address_and_contact(frm);
}
var grid = cur_frm.get_field("sales_team").grid;
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
index 5d84ac1..669cabf 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -5,6 +5,7 @@
if(doc.__islocal){
hide_field(['address_html', 'contact_html']);
+ erpnext.utils.clear_address_and_contact(cur_frm);
}
else{
unhide_field(['address_html', 'contact_html']);
diff --git a/setup.py b/setup.py
index bcf7177..f52983d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = "6.7.3"
+version = "6.7.4"
with open("requirements.txt", "r") as f:
install_requires = f.readlines()