schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-06-30 01:03:49 +05:30
committed by GitHub
parent 6f24c02121
commit f31b008502
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/assets/doctype/asset_repair/asset_repair.json
View File

@@ -249,11 +249,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-06-13 16:14:14.398356",
=======
"modified": "2025-06-29 22:30:00.589597", "modified": "2025-06-29 22:30:00.589597",
>>>>>>> c6baa34812 (fix: validate asset before repair)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Repair", "name": "Asset Repair",
@@ -291,12 +287,7 @@
"write": 1 "write": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation",
>>>>>>> c6baa34812 (fix: validate asset before repair)
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"title_field": "asset_name", "title_field": "asset_name",