Merge branch 'develop' into remove-nonprofit

2022-01-24 11:35:47 +05:30
parent 4bdf6248aa a3ec78991f
commit 7086d3f3d7
318 changed files with 3195 additions and 17751 deletions
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -351,7 +351,8 @@ def add_uom_data():
 				"doctype": "UOM",
 				"uom_name": _(d.get("uom_name")),
 				"name": _(d.get("uom_name")),
-				"must_be_whole_number": d.get("must_be_whole_number")
+				"must_be_whole_number": d.get("must_be_whole_number"),
+				"enabled": 1,
 			}).db_insert()

 	# bootstrap uom conversion factors