diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
index 7729d22377d..ce3a7fddb75 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
@@ -92,13 +92,13 @@ def get_charts_for_country(country):
 				with open(os.path.join(path, fname), "r") as f:
 					_get_chart_name(f.read())
 
-	countries_use_OHADA_system = ["Benin", "Burkina Faso", "Cameroon", "Central African Republic", "Comoros",
-		"Congo", "Ivory Coast", "Gabon", "Guinea", "Guinea Bissau", "Equatorial Guinea", "Mali", "Niger",
-		"Replica of Democratic Congo", "Senegal", "Chad", "Togo"]
-
-	if country in countries_use_OHADA_system:
-		with open(os.path.join(os.path.dirname(__file__), "syscohada_syscohada_chart_template.json"), "r") as f:
-			_get_chart_name(f.read())
+	# countries_use_OHADA_system = ["Benin", "Burkina Faso", "Cameroon", "Central African Republic", "Comoros",
+	# 	"Congo", "Ivory Coast", "Gabon", "Guinea", "Guinea Bissau", "Equatorial Guinea", "Mali", "Niger",
+	# 	"Replica of Democratic Congo", "Senegal", "Chad", "Togo"]
+	#
+	# if country in countries_use_OHADA_system:
+	# 	with open(os.path.join(os.path.dirname(__file__), "syscohada_syscohada_chart_template.json"), "r") as f:
+	# 		_get_chart_name(f.read())
 
 	if len(charts) != 1:
 		charts.append("Standard")
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index 8202f437599..657756d7578 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -152,7 +152,9 @@ $.extend(cur_frm.cscript, {
 			method: "erpnext.manufacturing.doctype.production_order.production_order.get_item_details",
 			args: { item: doc.production_item },
 			callback: function(r) {
-				cur_frm.set_value(r.message);
+				$.each(["description", "stock_uom", "bom_no"], function(i, field) {
+					cur_frm.set_value(field, r.message[field]);
+				});
 			}
 		});
 	},
@@ -187,8 +189,8 @@ $.extend(cur_frm.cscript, {
 
 	bom_no: function() {
 		return this.frm.call({
-		doc: this.frm.doc,
-		method: "set_production_order_operations"
+			doc: this.frm.doc,
+			method: "set_production_order_operations"
 		});
 	},