Merge branch 'develop' into subcontracting

2022-05-20 11:56:25 +05:30
parent e9b28452e4 5edd1dbb35
commit 213113bc00
892 changed files with 157085 additions and 36805 deletions
--- a/erpnext/controllers/tests/test_subcontracting_controller.py
+++ b/erpnext/controllers/tests/test_subcontracting_controller.py
@@ -1021,4 +1021,4 @@ def make_subcontracted_item(**args):
 		args.raw_materials = ["_Test FG Item", "Test Extra Item 1"]

 	if not frappe.db.get_value("BOM", {"item": args.item_code}, "name"):
-		make_bom(item=args.item_code, raw_materials=args.get("raw_materials"))
+		make_bom(item=args.item_code, raw_materials=args.get("raw_materials"))