From 5cb8e5dfbd7e81f7526aac8e1eb40ab1d898e626 Mon Sep 17 00:00:00 2001 From: Himanshu Shivhare Date: Thu, 10 Apr 2025 23:18:43 +0530 Subject: [PATCH 1/3] chore: Fix typo "Item Wise Tax Detail " (cherry picked from commit 9624d56abd3e5a7f1e2c4b96a1c26f2048e3f31a) --- .../purchase_taxes_and_charges/purchase_taxes_and_charges.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e82649a25ab..10130ec344f 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 @@ -196,7 +196,7 @@ "fieldname": "item_wise_tax_detail", "fieldtype": "Code", "hidden": 1, - "label": "Item Wise Tax Detail ", + "label": "Item Wise Tax Detail", "oldfieldname": "item_wise_tax_detail", "oldfieldtype": "Small Text", "print_hide": 1, 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 2/3] 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 } From f53a45cfefd6896c99c2f8d794021fc07f505ea4 Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Mon, 21 Apr 2025 16:30:20 +0530 Subject: [PATCH 3/3] chore: resolve conflict --- .../purchase_taxes_and_charges.json | 9 --------- 1 file changed, 9 deletions(-) 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 0d92a538b3d..008d63ae76f 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 @@ -239,23 +239,14 @@ "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 }