nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-01 19:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-07-15 17:17:20 +05:30
committed by Rohit Waghchaure
parent 6fddf4c5aa
commit 873e0a4219
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/stock/doctype/packed_item/packed_item.json
View File

@@ -304,22 +304,13 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-02-18 13:07:02.789654",
=======
"modified": "2025-07-09 19:12:45.850219", "modified": "2025-07-09 19:12:45.850219",
>>>>>>> f3460ec840 (fix: carry forward the delivered_by_supplier check to PO)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Packed Item", "name": "Packed Item",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> f3460ec840 (fix: carry forward the delivered_by_supplier check to PO)
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1