refactor: Order Number and Order Date fields to Blanket Order

(cherry picked from commit 5a284df51d)

# Conflicts:
#	erpnext/manufacturing/doctype/blanket_order/blanket_order.json

erpnext/manufacturing/doctype/blanket_order/blanket_order.json

@@ -13,6 +13,8 @@
   "supplier",
   "supplier_name",
   "column_break_8",
+  "order_no",
+  "order_date",
   "from_date",
   "to_date",
   "company",
@@ -129,15 +131,31 @@
    "fieldname": "terms",
    "fieldtype": "Text Editor",
    "label": "Terms and Conditions Details"
+  },
+  {
+   "fieldname": "order_no",
+   "fieldtype": "Data",
+   "label": "Order No"
+  },
+  {
+   "depends_on": "eval:doc.order_no",
+   "fieldname": "order_date",
+   "fieldtype": "Date",
+   "label": "Order Date"
   }
  ],
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2021-06-29 00:30:30.621636",
+=======
+ "modified": "2024-12-05 15:44:21.520093",
+>>>>>>> 5a284df51d (refactor: Order Number and Order Date fields to Blanket Order)
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Blanket Order",
+ "naming_rule": "By \"Naming Series\" field",
  "owner": "Administrator",
  "permissions": [
   {

erpnext/manufacturing/doctype/blanket_order/blanket_order.py

@@ -31,6 +31,8 @@ class BlanketOrder(Document):
 		from_date: DF.Date
 		items: DF.Table[BlanketOrderItem]
 		naming_series: DF.Literal["MFG-BLR-.YYYY.-"]
+		order_date: DF.Date | None
+		order_no: DF.Data | None
 		supplier: DF.Link | None
 		supplier_name: DF.Data | None
 		tc_name: DF.Link | None