From 1dc98124dc0840e4ef2bc44429d300f7ba544dd7 Mon Sep 17 00:00:00 2001
From: marination <25857446+marination@users.noreply.github.com>
Date: Tue, 15 Apr 2025 13:15:50 +0200
Subject: [PATCH] fix: Modify .json from desk to change `modified`

(cherry picked from commit be556167b1249f4a5f9ffe196528bf6773b22981)

# Conflicts:
#	erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
---
 .../purchase_taxes_and_charges.json                    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
index 10130ec344f..0d92a538b3d 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -235,17 +235,27 @@
    "read_only": 1
   }
  ],
+ "grid_page_length": 50,
  "idx": 1,
  "istable": 1,
  "links": [],
+<<<<<<< HEAD
  "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",
  "module": "Accounts",
  "name": "Purchase Taxes and Charges",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
+<<<<<<< HEAD
  "sort_field": "modified",
+=======
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+>>>>>>> be556167b1 (fix: Modify .json from desk to change `modified`)
  "sort_order": "DESC",
  "track_changes": 1
 }