nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 15:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-03-16 11:06:48 +05:30
committed by GitHub
parent 2fbaa77c3c
commit 5afac20d0e
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/work_order/work_order.json
View File

@@ -603,11 +603,7 @@
"image_field": "image", "image_field": "image",
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-06-21 00:55:45.916224",
=======
"modified": "2026-03-16 10:15:28.708688", "modified": "2026-03-16 10:15:28.708688",
>>>>>>> ebb4a3d053 (fix: use bom source warehouse in WO created from PP)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Manufacturing", "module": "Manufacturing",
"name": "Work Order", "name": "Work Order",