Merge pull request #6970 from komsel2228/develop

fix bugs uom and conversion factor on stock entry
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 561d20e..81b5c1b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -431,9 +431,25 @@
 	uom: function(doc, cdt, cdn) {
 		var d = locals[cdt][cdn];
 		if(d.uom && d.item_code){
-			var arg = {'item_code':d.item_code, 'uom':d.uom, 'qty':d.qty}
-			return get_server_fields('get_uom_details', JSON.stringify(arg),
-				'items', doc, cdt, cdn, 1);
+			arg = {
+					'item_code':d.item_code,
+					'uom':d.uom,
+					'qty':d.qty
+			};
+			return frappe.call({
+				doc: cur_frm.doc,
+				method: "get_uom_details",
+				args: arg,
+				callback: function(r) {
+					if(r.message) {
+						var d = locals[cdt][cdn];
+						$.each(r.message, function(k, v) {
+							d[k] = v;
+						});
+						refresh_field("items");
+					}
+				}
+			});
 		}
 	},
 	item_code: function(doc, cdt, cdn) {