| commit | 8be501704842aa064e5a6ee082268dd395623746 | [log] [tgz] |
|---|---|---|
| author | Nabin Hait <nabinhait@gmail.com> | Wed Jan 11 16:58:01 2012 +0530 |
| committer | Nabin Hait <nabinhait@gmail.com> | Wed Jan 11 16:58:01 2012 +0530 |
| tree | 125f0510618ef49533819de8282cfa570a4b991d | |
| parent | 42a411398a2ce42fbd6c0af65eb72acefba4265a [diff] | |
| parent | a550c067299fe763d36dd593714ce8e82eb06764 [diff] |
Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/home/page/profile_settings/profile_settings.py b/erpnext/home/page/profile_settings/profile_settings.py index ffa0e7f..22af804 100644 --- a/erpnext/home/page/profile_settings/profile_settings.py +++ b/erpnext/home/page/profile_settings/profile_settings.py
@@ -32,7 +32,10 @@ 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 9be3e2d..6708e37 100644 --- a/erpnext/setup/doctype/other_charges/other_charges.js +++ b/erpnext/setup/doctype/other_charges/other_charges.js
@@ -16,7 +16,7 @@ return ''; } -cur_frm.pformat.round_total_export = function(doc) { +cur_frm.pformat.rounded_total_export = function(doc) { return ''; }