Fixed conflict while merging v4 into v5

erpnext/patches/v4_2/recalculate_bom_cost.py

@@ -6,11 +6,11 @@ import frappe
 
 def execute():
 	for d in frappe.db.sql("select name from `tabBOM` where docstatus < 2"):
-		try:	
+		try:
 			document = frappe.get_doc('BOM', d[0])
 			if document.docstatus == 1:
-				document.ignore_validate_update_after_submit = True
+				document.flags.ignore_validate_update_after_submit = True
 				document.calculate_cost()
 			document.save()
 		except:
-			pass
+			pass

erpnext/patches/v4_2/reset_bom_costs.py

@@ -9,7 +9,7 @@ def execute():
 	for d in frappe.db.sql("""select name from `tabBOM` where docstatus < 2""", as_dict=1):
 		try:
 			bom = frappe.get_doc('BOM', d.name)
-			bom.ignore_validate_update_after_submit = True
+			bom.flags.ignore_validate_update_after_submit = True
 			bom.calculate_cost()
 			bom.save()
 			frappe.db.commit()