nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-06-25 14:47:47 +05:30
committed by GitHub
parent df938f24d4
commit ddbdcbb026
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/assets/doctype/asset_movement/asset_movement.json
View File

@@ -97,11 +97,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-06-28 16:54:26.571083",
=======
"modified": "2025-05-30 17:01:55.864353", "modified": "2025-05-30 17:01:55.864353",
>>>>>>> f5e5146021 (feat: added Transfer and Issue option in purpose)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Movement", "name": "Asset Movement",
@@ -154,12 +150,8 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic", "row_format": "Dynamic",
"sort_field": "creation", "sort_field": "creation",
>>>>>>> f5e5146021 (feat: added Transfer and Issue option in purpose)
"sort_order": "DESC", "sort_order": "DESC",
"states": [] "states": []
} }