nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-17 16:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2026-07-15 10:48:51 +05:30
committed by GitHub
parent 20f6ac81b9
commit b256c76c3b
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
View File

@@ -953,11 +953,7 @@
"index_web_pages_for_search": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2026-05-14 12:16:16.192936",
=======
"modified": "2026-07-15 10:30:04.600510",
>>>>>>> f44bcae47d (fix: hide job card field in purchase order item)
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item",