nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-14 20:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-02-05 14:43:24 +05:30
committed by GitHub
parent bbecd36a5d
commit 223fe62638
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
View File

@@ -136,11 +136,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2021-01-22 14:10:23.085181",
=======
"modified": "2024-08-13 16:21:18.639208", "modified": "2024-08-13 16:21:18.639208",
>>>>>>> d4fdada83c (feat: account heads changed along with journal entry type and descrip… (#42845))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Assets", "module": "Assets",
"name": "Asset Value Adjustment", "name": "Asset Value Adjustment",
@@ -197,4 +193,4 @@
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "asset", "title_field": "asset",
"track_changes": 1 "track_changes": 1
} }