From 06d43bcfe2cead37cca632b8dfe54c9f56fb5199 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 11 Jan 2012 15:05:24 +0530 Subject: [PATCH 1/2] Fix: Rounded Total appearing extra in Standard Print Format --- erpnext/setup/doctype/other_charges/other_charges.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/doctype/other_charges/other_charges.js b/erpnext/setup/doctype/other_charges/other_charges.js index 9be3e2d5779..6708e371524 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 ''; } From a550c067299fe763d36dd593714ce8e82eb06764 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 11 Jan 2012 16:53:50 +0530 Subject: [PATCH 2/2] last_name optional in profile settings --- erpnext/home/page/profile_settings/profile_settings.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/home/page/profile_settings/profile_settings.py b/erpnext/home/page/profile_settings/profile_settings.py index ffa0e7f33ab..22af8044f56 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')