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: fix conflicts

Browse Source 
(cherry picked from commit 41f20a9c64)
This commit is contained in:
rohitwaghchaure
2025-03-26 22:11:43 +05:30
committed by Mergify
parent f3ba5a81ab
commit ad3f985dc4
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/stock_entry_detail/stock_entry_detail.json
View File

@@ -613,23 +613,14 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-03-26 21:01:58.544797",
"modified": "2024-02-25 15:58:40.982582",
=======
"modified": "2025-03-26 21:00:58.544797",
>>>>>>> 5ddb36af87 (fix: slow query)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry Detail", "name": "Stock Entry Detail",
"naming_rule": "Random", "naming_rule": "Random",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> 5ddb36af87 (fix: slow query)
"sort_order": "ASC", "sort_order": "ASC",
"states": [] "states": []
} }