chore: conflicts and removed unnecessary files

erpnext/manufacturing/doctype/bom/bom.json

@@ -80,6 +80,8 @@
   "web_long_description",
   "reference_section",
   "bom_creator",
+  "bom_creator_item",
+  "column_break_oxbz",
   "amended_from",
   "connections_tab"
  ],
@@ -610,19 +612,31 @@
   {
    "fieldname": "bom_creator",
    "fieldtype": "Link",
-   "label": "BOM Configurator",
+   "label": "BOM Creator",
    "no_copy": 1,
    "options": "BOM Creator",
    "print_hide": 1,
    "read_only": 1
+  },
+  {
+   "fieldname": "bom_creator_item",
+   "fieldtype": "Data",
+   "label": "BOM Creator Item",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_oxbz",
+   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-sitemap",
  "idx": 1,
  "image_field": "image",
  "is_submittable": 1,
  "links": [],
- "modified": "2023-08-04 14:27:32.961309",
+ "modified": "2023-08-07 11:38:08.152294",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM",

erpnext/manufacturing/doctype/bom/bom.py

@@ -206,6 +206,7 @@ def on_update(self):
 
 	def on_submit(self):
 		self.manage_default_bom()
+		self.update_bom_creator_status()
 
 	def on_cancel(self):
 		self.db_set("is_active", 0)
@@ -214,6 +215,23 @@ def on_cancel(self):
 		# check if used in any other bom
 		self.validate_bom_links()
 		self.manage_default_bom()
+		self.update_bom_creator_status()
+
+	def update_bom_creator_status(self):
+		if not self.bom_creator:
+			return
+
+		if self.bom_creator_item:
+			frappe.db.set_value(
+				"BOM Creator Item",
+				self.bom_creator_item,
+				"bom_created",
+				1 if self.docstatus == 1 else 0,
+				update_modified=False,
+			)
+
+		doc = frappe.get_doc("BOM Creator", self.bom_creator)
+		doc.set_status(save=True)
 
 	def on_update_after_submit(self):
 		self.validate_bom_links()

erpnext/manufacturing/doctype/bom_creator/bom_creator.json

@@ -39,14 +39,17 @@
   "raw_material_cost",
   "remarks_tab",
   "remarks",
+  "section_break_yixm",
+  "status",
+  "column_break_irab",
+  "error_log",
   "connections_tab",
   "amended_from"
  ],
  "fields": [
   {
    "fieldname": "company",
    "fieldtype": "Link",
-   "in_list_view": 1,
    "label": "Company",
    "options": "Company",
    "remember_last_selected_value": 1,
@@ -106,7 +109,6 @@
   {
    "fieldname": "conversion_rate",
    "fieldtype": "Float",
-   "in_list_view": 1,
    "label": "Conversion Rate",
    "precision": "9",
    "reqd": 1
@@ -133,6 +135,7 @@
   {
    "fieldname": "raw_material_cost",
    "fieldtype": "Currency",
+   "in_list_view": 1,
    "label": "Total Cost",
    "no_copy": 1,
    "options": "currency",
@@ -156,6 +159,8 @@
   {
    "fieldname": "item_code",
    "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Finished Good",
    "options": "Item",
    "reqd": 1
@@ -250,6 +255,29 @@
    "fieldname": "set_rate_based_on_warehouse",
    "fieldtype": "Check",
    "label": "Set Valuation Rate Based on Source Warehouse"
+  },
+  {
+   "fieldname": "section_break_yixm",
+   "fieldtype": "Section Break"
+  },
+  {
+   "default": "Draft",
+   "fieldname": "status",
+   "fieldtype": "Select",
+   "label": "Status",
+   "no_copy": 1,
+   "options": "Draft\nSubmitted\nIn Progress\nCompleted\nFailed\nCancelled",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_irab",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "error_log",
+   "fieldtype": "Text",
+   "label": "Error Log",
+   "read_only": 1
   }
  ],
  "icon": "fa fa-sitemap",
@@ -260,7 +288,7 @@
    "link_fieldname": "bom_creator"
   }
  ],
- "modified": "2023-08-04 14:29:51.375361",
+ "modified": "2023-08-07 13:42:20.270471",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Creator",