From 583182180a25c94ae4d3ee2eca4db8cad726af6a Mon Sep 17 00:00:00 2001
From: Himanshu Shivhare <himanshushivhare047@gmail.com>
Date: Thu, 5 Dec 2024 15:46:46 +0530
Subject: [PATCH 1/2] refactor: Order Number and Order Date fields to Blanket
 Order

(cherry picked from commit 5a284df51dd171e7c6e62a7257dc456ee754c573)

# Conflicts:
#	erpnext/manufacturing/doctype/blanket_order/blanket_order.json
---
 .../doctype/blanket_order/blanket_order.json   | 18 ++++++++++++++++++
 .../doctype/blanket_order/blanket_order.py     |  2 ++
 2 files changed, 20 insertions(+)

diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
index a63fc4da69a..38f5a5e8276 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
+++ b/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": [
   {
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
index 5ecf9d3a9d6..26fce935abb 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
+++ b/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

From 7b907424095b38fab9db9902b9d8424d08ee36d6 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Mon, 30 Dec 2024 14:50:23 +0530
Subject: [PATCH 2/2] chore: resolve conflict

---
 .../manufacturing/doctype/blanket_order/blanket_order.json    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
index 38f5a5e8276..0e2e7273f10 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
@@ -147,11 +147,7 @@
  "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",