nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 11:19:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait
2012-01-11 16:58:01 +05:30
parent 42a411398a a550c06729
commit 8be5017048
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/home/page/profile_settings/profile_settings.py
View File

@@ -32,7 +32,10 @@ def set_user_details(arg=None):
from webnotes.model.doc import Document from webnotes.model.doc import Document
p = Document('Profile', webnotes.user.name) 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() p.save()
webnotes.msgprint('Updated') webnotes.msgprint('Updated')

2
erpnext/setup/doctype/other_charges/other_charges.js
View File

@@ -16,7 +16,7 @@ cur_frm.pformat.grand_total_export = function(doc) {
return ''; return '';
} }
cur_frm.pformat.round_total_export = function(doc) { cur_frm.pformat.rounded_total_export = function(doc) {
return ''; return '';
} }