From 3c06919abe455c2c3a51338d8d367d0f09e6f97f Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 5 Dec 2012 14:27:48 +0530
Subject: [PATCH 1/9] refactored leave and expense

---
 public/js/legacy/widgets/form/clientscriptAPI.js | 13 ++++++++-----
 public/js/legacy/widgets/form/form.js            | 15 ++++++++-------
 public/js/wn/perm.js                             | 16 ++++++++++++----
 webnotes/model/doc.py                            | 13 ++++++++-----
 webnotes/model/wrapper.py                        |  3 ++-
 webnotes/profile.py                              |  2 +-
 webnotes/widgets/reportview.py                   | 12 +++++++++---
 7 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/public/js/legacy/widgets/form/clientscriptAPI.js b/public/js/legacy/widgets/form/clientscriptAPI.js
index f4cba203b6..6cb86a3a04 100644
--- a/public/js/legacy/widgets/form/clientscriptAPI.js
+++ b/public/js/legacy/widgets/form/clientscriptAPI.js
@@ -234,12 +234,14 @@ _f.Frm.prototype.set_query = function(fieldname, opt1, opt2) {
 _f.Frm.prototype.set_value = function(field, value) {
 	var me = this;
 	var _set = function(f, v) {
-		me.doc[f] = v;
-		me.fields_dict[f].refresh();		
+		if(me.fields_dict[f]) {
+			me.doc[f] = v;
+			me.fields_dict[f].refresh();
+		}
 	}
 	if(typeof field=="string") {
 		_set(field, value)
-	} else {
+	} else if($.isPlainObject(field)) {
 		$.each(field, function(f, v) {
 			_set(f, v);
 		})
@@ -249,10 +251,11 @@ _f.Frm.prototype.set_value = function(field, value) {
 _f.Frm.prototype.call = function(opts) {
 	var me = this;
 	if(!opts.doc) {
-		opts.method = wn.model.get_server_module_name(me.doctype) + "." + opts.method; 
+		if(opts.method.indexOf(".")==-1)
+			opts.method = wn.model.get_server_module_name(me.doctype) + "." + opts.method; 
 		opts.original_callback = opts.callback;
 		opts.callback = function(r) {
-			if(typeof (r.message || "")=="object") {
+			if($.isPlainObject(r.message)) {
 				me.set_value(r.message);
 			}
 			opts.original_callback && opts.original_callback(r);
diff --git a/public/js/legacy/widgets/form/form.js b/public/js/legacy/widgets/form/form.js
index e9c907b138..701cbe265b 100644
--- a/public/js/legacy/widgets/form/form.js
+++ b/public/js/legacy/widgets/form/form.js
@@ -298,7 +298,7 @@ _f.Frm.prototype.setup_footer = function() {
 
 _f.Frm.prototype.set_intro = function(txt) {
 	if(!this.intro_area) {
-		this.intro_area = $('<div class="alert form-intro-area">')
+		this.intro_area = $('<div class="alert form-intro-area" style="margin-top: 20px;">')
 			.insertBefore(this.page_layout.body.firstChild);
 	}
 	if(txt) {
@@ -1005,20 +1005,21 @@ _f.Frm.prototype.reload_doc = function() {
 }
 
 _f.Frm.prototype.savesubmit = function(btn) {
-	var answer = confirm("Permanently Submit "+this.docname+"?");
 	var me = this;
-	if(answer) {
+	wn.confirm("Permanently Submit "+this.docname+"?", function() {
 		this.save('Submit', function(r) {
 			if(!r.exc && me.cscript.on_submit) {
 				me.runclientscript('on_submit', me.doctype, me.docname);
 			}
-		}, btn);
-	}
+		}, btn);		
+	});
 }
 
 _f.Frm.prototype.savecancel = function(btn) {
-	var answer = confirm("Permanently Cancel "+this.docname+"?");
-	if(answer) this.save('Cancel', null, btn);
+	var me = this;
+	wn.confirm("Permanently Submit "+this.docname+"?", function() {
+		this.save('Cancel', null, btn);
+	});
 }
 
 // delete the record
diff --git a/public/js/wn/perm.js b/public/js/wn/perm.js
index 5178e4593f..5e79296680 100644
--- a/public/js/wn/perm.js
+++ b/public/js/wn/perm.js
@@ -84,16 +84,24 @@ $.extend(wn.perm, {
 		if(!name) return true;
 		var out =false;
 		if(p.match) {
-			if(user_defaults[p.match]) {
-				for(var i=0;i<user_defaults[p.match].length;i++) {
+			if(p.match.indexOf(":")!=-1) {
+				keys = p.match.split(":");
+				var document_key = keys[0];
+				var default_key = keys[1];
+			} else {
+				var document_key = p.match;
+				var default_key = p.match;
+			}
+			if(user_defaults[default_key]) {
+				for(var i=0;i<user_defaults[default_key].length;i++) {
 					 // user must have match field in defaults
-					if(user_defaults[p.match][i]==locals[doctype][name][p.match]) {
+					if(user_defaults[default_key][i]==locals[doctype][name][document_key]) {
 					    // must match document
 			  			return true;
 					}
 				}
 				return false;
-			} else if(!locals[doctype][name][p.match]) { // blanks are true
+			} else if(!locals[doctype][name][document_key]) { // blanks are true
 				return true;
 			} else {
 				return false;
diff --git a/webnotes/model/doc.py b/webnotes/model/doc.py
index 67628726d4..9495c96df8 100755
--- a/webnotes/model/doc.py
+++ b/webnotes/model/doc.py
@@ -522,14 +522,17 @@ class Document:
 		
 		if has_perm and match and match != -1:
 			for m in match:
-				if self.fields.get(m, 'no value') in self._user_defaults.get(m, 'no default'):
+				if ":" in m:
+					document_key, default_key = m.split(":")
+				else:
+					document_key = default_key = m
+					
+				if self.fields.get(document_key, 'no value') in \
+					self._user_defaults.get(default_key, 'no default'):
 					has_perm = 1
 					break # permission found! break
 				else:
-					has_perm = 0
-					if verbose:
-						webnotes.msgprint("Value not allowed: '%s' for '%s'" % (self.fields.get(m, 'no value'), m))
-	
+					has_perm = 0	
 				
 		return has_perm
 		
diff --git a/webnotes/model/wrapper.py b/webnotes/model/wrapper.py
index b08c8d5860..1af9480a4a 100644
--- a/webnotes/model/wrapper.py
+++ b/webnotes/model/wrapper.py
@@ -129,7 +129,8 @@ class ModelWrapper:
 			Raises exception if permission is not valid
 		"""
 		if not self.doc.check_perm(verbose=1):
-			webnotes.msgprint("Not enough permission to save %s" % self.doc.doctype, raise_exception=1)
+			webnotes.msgprint("Not enough permission to save %s" % 
+				self.doc.doctype, raise_exception=1)
 
 	def check_links(self):
 		"""
diff --git a/webnotes/profile.py b/webnotes/profile.py
index 70d3b4958e..76b01fb7d7 100644
--- a/webnotes/profile.py
+++ b/webnotes/profile.py
@@ -145,7 +145,7 @@ class Profile:
 		res = webnotes.conn.sql("""select defkey, defvalue 
 		from `tabDefaultValue` where parent in ("%s") order by idx""" % '", "'.join(roles))
 	
-		self.defaults = {'owner': [self.name,]}
+		self.defaults = {'owner': [self.name], "user": [self.name]}
 
 		for rec in res: 
 			if not self.defaults.has_key(rec[0]): 
diff --git a/webnotes/widgets/reportview.py b/webnotes/widgets/reportview.py
index 3891eea4e1..1339c989d8 100644
--- a/webnotes/widgets/reportview.py
+++ b/webnotes/widgets/reportview.py
@@ -108,7 +108,7 @@ def run_custom_query(data):
 	query = data['query']
 	if '%(key)s' in query:
 		query = query.replace('%(key)s', 'name')
-	return webnotes.conn.sql(query, as_dict=1, debug=1)
+	return webnotes.conn.sql(query, as_dict=1)
 
 def load_doctypes():
 	"""load all doctypes and roles"""
@@ -192,9 +192,15 @@ def build_match_conditions(data, conditions):
 		if d.doctype == 'DocPerm' and d.parent == data['doctype']:
 			if d.role in roles:
 				if d.match: # role applicable
-					for v in webnotes.user.defaults.get(d.match, ['**No Match**']):
+					if ':' in d.match:
+						document_key, default_key = d.match.split(":")
+					else:
+						default_key = document_key = d.match
+				
+					for v in webnotes.user.defaults.get(default_key, ['**No Match**']):
 						match_conditions.append('`tab%s`.%s="%s"' % (data['doctype'],
-							d.match, v))
+							document_key, v))
+							
 				elif d.read == 1 and d.permlevel == 0:
 					# don't restrict if another read permission at level 0 
 					# exists without a match restriction

From 7c6f760e8d068092e53a8813d6b9ac350955f766 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 5 Dec 2012 15:45:48 +0530
Subject: [PATCH 2/9] added patch for expense and leave

---
 .../page/data_import_tool/data_import_tool.py |   4 +-
 public/js/legacy/widgets/form/print_format.js | 191 +-----------------
 2 files changed, 3 insertions(+), 192 deletions(-)

diff --git a/core/page/data_import_tool/data_import_tool.py b/core/page/data_import_tool/data_import_tool.py
index 375e6ce23e..72d3854a2d 100644
--- a/core/page/data_import_tool/data_import_tool.py
+++ b/core/page/data_import_tool/data_import_tool.py
@@ -153,13 +153,13 @@ def upload():
 	
 	def get_start_row():
 		for i, row in enumerate(rows):
-			if row[0]==data_keys.data_separator:
+			if row and row[0]==data_keys.data_separator:
 				return i+1
 		bad_template()
 				
 	def get_header_row(key):
 		for i, row in enumerate(header):
-			if row[0]==key:
+			if row and row[0]==key:
 				return row
 		return []
 		
diff --git a/public/js/legacy/widgets/form/print_format.js b/public/js/legacy/widgets/form/print_format.js
index abfd9f7a98..13cb39b1ba 100644
--- a/public/js/legacy/widgets/form/print_format.js
+++ b/public/js/legacy/widgets/form/print_format.js
@@ -640,193 +640,4 @@ $.extend(_p, {
 		row.cells[1].className = 'datainputcell';
 		return row;
 	}
-});
-
-
-// print_table = function(dt, dn, fieldname, tabletype, cols, head_labels, widths, condition, cssClass, modifier, hide_empty) {
-// 	var me = this;
-// 	$.extend(this, {
-// 		flist: (function() {
-// 			var f_list = [];
-// 			var fl = wn.meta.docfield_list[tabletype];
-// 			if(fl) {
-// 				for(var i=0; i<fl.length; i++) {
-// 					f_list.push(copy_dict(fl[i]));
-// 				}
-// 			}
-// 			return f_list;
-// 		})(),
-// 
-// 		data: function() {
-// 			var children = getchildren(
-// 				tabletype, // child_dt
-// 				dn, // parent
-// 				fieldname, // parentfield
-// 				dt // parenttype
-// 			);
-// 			var data = []
-// 			for(var i=0; i<children.length; i++) {
-// 				data.push(copy_dict(children[i]));
-// 			}
-// 			return data;
-// 		}(),
-// 		
-// 		cell_style: {
-// 			border: '1px solid #999',
-// 			padding: '3px',
-// 			verticalAlign: 'top'	
-// 		},
-// 		
-// 		head_cell_style: {
-// 			border: '1px solid #999',
-// 			padding: '3px',
-// 			verticalAlign: 'top',
-// 			backgroundColor: '#ddd',
-// 			fontWeight: 'bold'
-// 		},
-// 		
-// 		table_style: {
-// 			width: '100%',
-// 			borderCollapse: 'collapse',
-// 			marginBottom: '10px',
-// 			marginTop: '10px'		
-// 		},
-// 
-// 		remove_empty_cols: function(flist) {
-// 			var non_empty_cols = []
-// 			for(var i=0; i<me.data.length; i++) {
-// 				for(var c=0; c<flist.length; c++) {
-// 					if(flist[c].print_hide || !inList(['', null], me.data[i][flist[c].fieldname])) {
-// 						if(!inList(non_empty_cols, flist[c])) {
-// 							non_empty_cols.push(flist[c]);
-// 						}
-// 					}
-// 				}
-// 			}
-// 			for(var c=0; c<flist.length; c++) {
-// 				if(!inList(non_empty_cols, flist[c])) {
-// 					flist.splice(c, 1);
-// 					c = c - 1;
-// 				}
-// 			}
-// 		},
-// 		
-// 		/*
-// 			This function prepares a list of columns to be displayed and calls make_print_table to create a table with these columns
-// 		*/
-// 		prepare_col_heads: function(flist) {
-// 			var new_flist = [];
-// 
-// 			if(!cols || (cols && cols.length && hide_empty)) {
-// 				me.remove_empty_cols(flist);
-// 			}
-// 			
-// 			// Make a list of column headings
-// 			if(cols && cols.length) {
-// 				// If cols to be displayed are passed in print_table
-// 				if(cols[0] == 'SR') { new_flist.push('SR') }
-// 				for(var i = 0; i < cols.length; i++) {
-// 					for(var j = 0; j < flist.length; j++) {
-// 						if(flist[j].fieldname == cols[i]) {
-// 							new_flist.push(flist[j]);
-// 							break;
-// 						}
-// 					}
-// 				}			
-// 			} else {
-// 				// Default action: remove hidden cols
-// 				new_flist.push('SR');
-// 				for(var i = 0; i < flist.length; i++) {
-// 					if(!flist[i].print_hide) {
-// 						new_flist.push(flist[i]);
-// 					}
-// 				}			
-// 			}
-// 			
-// 			// Changing me.flist so that it could be used to hide data
-// 			me.flist = new_flist;
-// 		},
-// 		
-// 		// This function makes a new table with its heading rows
-// 		make_print_table: function(flist) {
-// 			// Make a table
-// 			var wrapper = document.createElement('div');
-// 			var table = $a(wrapper, 'table', '', me.table_style);
-// 			table.wrapper = wrapper;
-// 			
-// 			// Make Head Row
-// 			table.insertRow(0);
-// 			var col_start = 0;
-// 			
-// 			// If 'SR' exists in flist, then create its heading column cell
-// 			if(flist[0]=='SR') {
-// 				var cell = table.rows[0].insertCell(0);
-// 				cell.innerHTML = head_labels?head_labels[0]:'<b>SR</b>';
-// 				$y(cell, { width: '30px' });
-// 				$y(cell, me.head_cell_style);
-// 				col_start++;
-// 			}
-// 			
-// 			for(var c = col_start; c < flist.length; c++) {
-// 				var cell = table.rows[0].insertCell(c);
-// 				$y(cell, me.head_cell_style);
-// 				cell.innerHTML = head_labels?head_labels[c]:flist[c].label;
-// 				if(flist[c].width) { $y(cell, {width: flist[c].width}); }
-// 				if(widths) { $y(cell, {width: widths[c]}); }
-// 				if(in_list(['Currency', 'Float'], flist[c].fieldtype)) {
-// 					$y(cell, { textAlign: 'right' });
-// 				}
-// 			}
-// 			return table;
-// 		},
-// 		
-// 		// Populate table with data
-// 		populate_table: function(table, data) {
-// 			for(var r = 0; r < data.length; r++) {
-// 				if((!condition) || (condition(data[r]))) {
-// 					// Check for page break
-// 					if(data[r].page_break) {
-// 						table = me.make_print_table(me.flist);
-// 						me.table_list.push(table.wrapper);
-// 					}
-// 					
-// 					var row = table.insertRow(table.rows.length);
-// 					
-// 					// Add serial number if required
-// 					if(me.flist[0] == 'SR') {
-// 						var cell = row.insertCell(0);
-// 						cell.innerHTML = r + 1;
-// 						$y(cell, me.cell_style);
-// 					}
-// 					
-// 					for(var c=me.flist.indexOf('SR')+1; c<me.flist.length; c++){
-// 						var cell = row.insertCell(c);
-// 						$y(cell, me.cell_style);
-// 						if(modifier && me.flist[c].fieldname in modifier) {
-// 							data[r][me.flist[c].fieldname] = modifier[me.flist[c].fieldname](data[r]);
-// 						}
-// 						$s(cell, data[r][me.flist[c].fieldname],
-// 							me.flist[c].fieldtype);
-// 						if(in_list(['Currency', 'Float'], me.flist[c].fieldtype)) {
-// 							cell.style.textAlign = 'right';
-// 						}
-// 					}
-// 				}			
-// 			}
-// 		}
-// 	});	
-// 	
-// 	// If no data, do not create table
-// 	if(!this.data.length) { return document.createElement('div'); }
-// 	
-// 	this.prepare_col_heads(this.flist);
-// 
-// 	var table = me.make_print_table(this.flist);
-// 
-// 	this.table_list = [table.wrapper];
-// 
-// 	this.populate_table(table, this.data);
-// 
-// 	// If multiple tables exists, send whole list, else send only one table
-// 	return (me.table_list.length > 1) ? me.table_list : me.table_list[0];
-// }
+});
\ No newline at end of file

From 437641dfad2bb6759414e04d492efe4558c9def1 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Wed, 5 Dec 2012 16:05:53 +0530
Subject: [PATCH 3/9] fixed Sr width in print format

---
 public/js/wn/print/print_table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/wn/print/print_table.js b/public/js/wn/print/print_table.js
index 5a3c898694..5df8b4f624 100644
--- a/public/js/wn/print/print_table.js
+++ b/public/js/wn/print/print_table.js
@@ -144,7 +144,7 @@ wn.print.Table = Class.extend({
 			this.widths = $.map(this.columns, function(fieldname, ci) {
 				df = wn.meta.docfield_map[me.tabletype][fieldname];
 				return df && df.width || 
-					(fieldname=="Sr" ? 20 : 80);
+					(fieldname=="Sr" ? 30 : 80);
 			})
 		}
 		var sum = 0;

From 88271b7623b87872ed392af2ddc88622f7e83eea Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 5 Dec 2012 17:06:07 +0530
Subject: [PATCH 4/9] message updates in Leave / Expense, catch localstorage
 error

---
 public/js/wn/assets.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/js/wn/assets.js b/public/js/wn/assets.js
index 87bc621368..b7129a6adb 100644
--- a/public/js/wn/assets.js
+++ b/public/js/wn/assets.js
@@ -64,7 +64,11 @@ wn.assets = {
 	// localstorage
 	add: function(src, txt) {
 		if('localStorage' in window) {
-			localStorage.setItem(src, txt);
+			try {
+				localStorage.setItem(src, txt);
+			} catch(e) {
+				console.log("Local Storage quota exceeded?")
+			}
 		}
 	},
 	

From a4e626d599c281b7ae60a3ac696b8e61232af717 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 5 Dec 2012 17:10:18 +0530
Subject: [PATCH 5/9] message updates in Leave / Expense, catch localstorage
 error

---
 public/js/legacy/widgets/form/form.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/legacy/widgets/form/form.js b/public/js/legacy/widgets/form/form.js
index 701cbe265b..dd8ce3b39c 100644
--- a/public/js/legacy/widgets/form/form.js
+++ b/public/js/legacy/widgets/form/form.js
@@ -1007,7 +1007,7 @@ _f.Frm.prototype.reload_doc = function() {
 _f.Frm.prototype.savesubmit = function(btn) {
 	var me = this;
 	wn.confirm("Permanently Submit "+this.docname+"?", function() {
-		this.save('Submit', function(r) {
+		me.save('Submit', function(r) {
 			if(!r.exc && me.cscript.on_submit) {
 				me.runclientscript('on_submit', me.doctype, me.docname);
 			}
@@ -1018,7 +1018,7 @@ _f.Frm.prototype.savesubmit = function(btn) {
 _f.Frm.prototype.savecancel = function(btn) {
 	var me = this;
 	wn.confirm("Permanently Submit "+this.docname+"?", function() {
-		this.save('Cancel', null, btn);
+		me.save('Cancel', null, btn);
 	});
 }
 

From a526517cbd2c439bdb1e6529777a7f7fa7240322 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 5 Dec 2012 17:27:48 +0530
Subject: [PATCH 6/9] message updates in Leave / Expense, catch localstorage
 error

---
 public/js/wn/views/reportview.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/js/wn/views/reportview.js b/public/js/wn/views/reportview.js
index 078d792dca..cfb97d6c37 100644
--- a/public/js/wn/views/reportview.js
+++ b/public/js/wn/views/reportview.js
@@ -362,7 +362,10 @@ wn.views.ReportView = wn.ui.Listing.extend({
 						})
 					},
 					callback: function(r) {
-						if(r.exc) return;
+						if(r.exc) {
+							msgprint("Report was not saved (there were errors)");
+							return;
+						}
 						if(r.message != me.docname)
 							wn.set_route('Report2', me.doctype, r.message);
 					}

From 8dd4c5b1c600d307e0b7435562f7d9ded00706dd Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 5 Dec 2012 18:02:13 +0530
Subject: [PATCH 7/9] leave application fix, print_table Sr fix

---
 public/js/wn/print/print_table.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/js/wn/print/print_table.js b/public/js/wn/print/print_table.js
index 5df8b4f624..cef9011209 100644
--- a/public/js/wn/print/print_table.js
+++ b/public/js/wn/print/print_table.js
@@ -102,11 +102,15 @@ wn.print.Table = Class.extend({
 				var df = wn.meta.docfield_map[me.tabletype][fieldname];
 				var label = df ? df.label : fieldname;
 			}
-			$("<td>").html(label)
+			var td = $("<td>").html(label)
 				.appendTo(headrow)
 				.css(me.head_cell_style)
 				.css({"width": me.widths[ci] + "%"});
-		})
+
+			if(ci==0) {
+				td.css({"min-width": "30px;"});
+			}
+		});
 		
 		$.each(data, function(ri, row) {
 			var allow = true;
@@ -118,7 +122,7 @@ wn.print.Table = Class.extend({
 				
 				$.each(me.columns, function(ci, fieldname) {
 					if(ci==0) 
-						var value = ri + 1;
+						var value = row.idx;
 					else
 						var value = row[fieldname];
 

From 435575d0675ec9b51ac4295943fb438f645ce051 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 5 Dec 2012 18:08:32 +0530
Subject: [PATCH 8/9] print_table Sr fix

---
 public/js/wn/print/print_table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/wn/print/print_table.js b/public/js/wn/print/print_table.js
index cef9011209..1d1573db54 100644
--- a/public/js/wn/print/print_table.js
+++ b/public/js/wn/print/print_table.js
@@ -108,7 +108,7 @@ wn.print.Table = Class.extend({
 				.css({"width": me.widths[ci] + "%"});
 
 			if(ci==0) {
-				td.css({"min-width": "30px;"});
+				td.css({"min-width": "30px"});
 			}
 		});
 		

From f66647f5e2459ea5b3f7bbd5790543520ce1edb3 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Wed, 5 Dec 2012 18:26:02 +0530
Subject: [PATCH 9/9] in cur_frm.call, if child is passed, update child and
 refresh parentfield

---
 public/js/legacy/widgets/form/clientscriptAPI.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/public/js/legacy/widgets/form/clientscriptAPI.js b/public/js/legacy/widgets/form/clientscriptAPI.js
index 6cb86a3a04..64b30d558d 100644
--- a/public/js/legacy/widgets/form/clientscriptAPI.js
+++ b/public/js/legacy/widgets/form/clientscriptAPI.js
@@ -256,7 +256,15 @@ _f.Frm.prototype.call = function(opts) {
 		opts.original_callback = opts.callback;
 		opts.callback = function(r) {
 			if($.isPlainObject(r.message)) {
-				me.set_value(r.message);
+				if(opts.child) {
+					// update child doc
+					opts.child = locals[opts.child.doctype][opts.child.name];
+					$.extend(opts.child, r.message);
+					me.fields_dict[opts.child.parentfield].refresh();
+				} else {
+					// update parent doc
+					me.set_value(r.message);
+				}
 			}
 			opts.original_callback && opts.original_callback(r);
 		}