From 915778fb69e413a1331111326806b480e10aff64 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 30 Oct 2015 14:43:13 +0530 Subject: [PATCH 1/2] [fix] Clear addressed and contacts on a new form --- erpnext/buying/doctype/supplier/supplier.js | 1 + erpnext/crm/doctype/lead/lead.js | 2 ++ erpnext/public/js/utils.js | 5 +++++ erpnext/selling/doctype/customer/customer.js | 2 ++ erpnext/setup/doctype/sales_partner/sales_partner.js | 1 + 5 files changed, 11 insertions(+) diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js index 7a4ea90df2..646dfbf018 100644 --- a/erpnext/buying/doctype/supplier/supplier.js +++ b/erpnext/buying/doctype/supplier/supplier.js @@ -12,6 +12,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { 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 e9b07fe010..1dc8eb2579 100644 --- a/erpnext/crm/doctype/lead/lead.js +++ b/erpnext/crm/doctype/lead/lead.js @@ -37,6 +37,8 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({ 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/public/js/utils.js b/erpnext/public/js/utils.js index 7f69202522..c0549ba41d 100644 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -100,6 +100,11 @@ $.extend(erpnext, { $.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 42cc93a81b..4cd5cc7e95 100644 --- a/erpnext/selling/doctype/customer/customer.js +++ b/erpnext/selling/doctype/customer/customer.js @@ -14,6 +14,8 @@ frappe.ui.form.on("Customer", "refresh", function(frm) { 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 5d84ac1815..669cabfff8 100644 --- a/erpnext/setup/doctype/sales_partner/sales_partner.js +++ b/erpnext/setup/doctype/sales_partner/sales_partner.js @@ -5,6 +5,7 @@ cur_frm.cscript.refresh = function(doc,dt,dn){ if(doc.__islocal){ hide_field(['address_html', 'contact_html']); + erpnext.utils.clear_address_and_contact(cur_frm); } else{ unhide_field(['address_html', 'contact_html']); From 1a8d4b6ea769aafe4d8a2a4d0db749779e9c8725 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 6 Nov 2015 12:15:09 +0600 Subject: [PATCH 2/2] bumped to version 6.7.4 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index edf498bfee..5abd582280 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/hooks.py b/erpnext/hooks.py index 6f6e07af8f..b459fb1806 100644 --- a/erpnext/hooks.py +++ b/erpnext/hooks.py @@ -29,7 +29,7 @@ blogs. """ 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/setup.py b/setup.py index bcf7177787..f52983dba7 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()