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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-10-09 16:56:47 +05:30
committed by GitHub
parent 24f4cedba5
commit 19ebf29119
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
View File

@@ -264,11 +264,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-09-16 14:37:26.441742",
"modified": "2025-09-15 14:37:26.441742",
=======
"modified": "2025-05-30 18:05:55.489195",
>>>>>>> 0557d4d180 (fix: incorrect serial no status after delivery note cancel (#47825))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Serial and Batch Bundle", "name": "Serial and Batch Bundle",
@@ -402,12 +398,7 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 0557d4d180 (fix: incorrect serial no status after delivery note cancel (#47825))
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"title_field": "item_code" "title_field": "item_code"