diff --git a/erpnext/home/page/profile_settings/profile_settings.py b/erpnext/home/page/profile_settings/profile_settings.py index ffa0e7f33a..22af8044f5 100644 --- a/erpnext/home/page/profile_settings/profile_settings.py +++ b/erpnext/home/page/profile_settings/profile_settings.py @@ -32,7 +32,10 @@ def set_user_details(arg=None): from webnotes.model.doc import Document p = Document('Profile', webnotes.user.name) - p.fields.update(load_json(arg)) + arg_dict = load_json(arg) + if not 'bio' in arg_dict: arg_dict['bio'] = None + if not 'last_name' in arg_dict: arg_dict['last_name'] = None + p.fields.update(arg_dict) p.save() webnotes.msgprint('Updated') diff --git a/erpnext/setup/doctype/other_charges/other_charges.js b/erpnext/setup/doctype/other_charges/other_charges.js index 9be3e2d577..6708e37152 100644 --- a/erpnext/setup/doctype/other_charges/other_charges.js +++ b/erpnext/setup/doctype/other_charges/other_charges.js @@ -16,7 +16,7 @@ cur_frm.pformat.grand_total_export = function(doc) { return ''; } -cur_frm.pformat.round_total_export = function(doc) { +cur_frm.pformat.rounded_total_export = function(doc) { return ''; }