nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-12-30 14:50:23 +05:30
parent 583182180a
commit 7b90742409
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/manufacturing/doctype/blanket_order/blanket_order.json
View File

@@ -147,11 +147,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-06-29 00:30:30.621636",
=======
"modified": "2024-12-05 15:44:21.520093", "modified": "2024-12-05 15:44:21.520093",
>>>>>>> 5a284df51d (refactor: Order Number and Order Date fields to Blanket Order)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Blanket Order", "name": "Blanket Order",