nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-21 07:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Modify .json from desk to change modified

Browse Source 
(cherry picked from commit be556167b1)

# Conflicts:
#	erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
This commit is contained in:
marination
2025-04-15 13:15:50 +02:00
committed by Mergify
parent 5cb8e5dfbd
commit 1dc98124dc
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
View File

@@ -235,17 +235,27 @@
"read_only": 1 "read_only": 1
} }
], ],
"grid_page_length": 50,
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-04-08 19:51:36.678551", "modified": "2024-04-08 19:51:36.678551",
=======
"modified": "2025-04-15 13:14:48.936047",
>>>>>>> be556167b1 (fix: Modify .json from desk to change `modified`)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Taxes and Charges", "name": "Purchase Taxes and Charges",
"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",
>>>>>>> be556167b1 (fix: Modify .json from desk to change `modified`)
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1 "track_changes": 1
} }