Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Rushabh Mehta 2015-11-06 11:45:09 +05:30
commit 0a0c267edb
8 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.7.3' __version__ = '6.7.4'

1
erpnext/buying/doctype/supplier/supplier.js
View File

@ -12,6 +12,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
if(doc.__islocal){ if(doc.__islocal){
hide_field(['address_html','contact_html']); hide_field(['address_html','contact_html']);
erpnext.utils.clear_address_and_contact(cur_frm);
} }
else{ else{
unhide_field(['address_html','contact_html']); unhide_field(['address_html','contact_html']);

2
erpnext/crm/doctype/lead/lead.js
View File

@ -37,6 +37,8 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({
if(!this.frm.doc.__islocal) { if(!this.frm.doc.__islocal) {
erpnext.utils.render_address_and_contact(cur_frm); erpnext.utils.render_address_and_contact(cur_frm);
} else {
erpnext.utils.clear_address_and_contact(cur_frm);
} }
}, },

2
erpnext/hooks.py
View File

@ -29,7 +29,7 @@ blogs.
""" """
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.7.3" app_version = "6.7.4"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"
error_report_email = "support@erpnext.com" error_report_email = "support@erpnext.com"

5
erpnext/public/js/utils.js
View File

@ -100,6 +100,11 @@ $.extend(erpnext, {
$.extend(erpnext.utils, { $.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_and_contact: function(frm) {
// render address // render address
$(frm.fields_dict['address_html'].wrapper) $(frm.fields_dict['address_html'].wrapper)

2
erpnext/selling/doctype/customer/customer.js
View File

@ -14,6 +14,8 @@ frappe.ui.form.on("Customer", "refresh", function(frm) {
if(!frm.doc.__islocal) { if(!frm.doc.__islocal) {
erpnext.utils.render_address_and_contact(frm); erpnext.utils.render_address_and_contact(frm);
} else {
erpnext.utils.clear_address_and_contact(frm);
} }
var grid = cur_frm.get_field("sales_team").grid; var grid = cur_frm.get_field("sales_team").grid;

1
erpnext/setup/doctype/sales_partner/sales_partner.js
View File

@ -5,6 +5,7 @@ cur_frm.cscript.refresh = function(doc,dt,dn){
if(doc.__islocal){ if(doc.__islocal){
hide_field(['address_html', 'contact_html']); hide_field(['address_html', 'contact_html']);
erpnext.utils.clear_address_and_contact(cur_frm);
} }
else{ else{
unhide_field(['address_html', 'contact_html']); unhide_field(['address_html', 'contact_html']);

2
setup.py
View File

@ -1,6 +1,6 @@
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = "6.7.3" version = "6.7.4"
with open("requirements.txt", "r") as f: with open("requirements.txt", "r") as f:
install_requires = f.readlines() install_requires = f.readlines()