From 1ec2a2cd5d99d6a0a1eef3f52f9f523177a817e7 Mon Sep 17 00:00:00 2001 From: khushi8112 Date: Thu, 13 Aug 2026 14:51:31 +0530 Subject: [PATCH 1/2] fix: describe stale exchange rate settings (cherry picked from commit 84cdd0daf03de5d47e1e417b1a25bd598c49c17f) # Conflicts: # erpnext/accounts/doctype/accounts_settings/accounts_settings.json --- .../doctype/accounts_settings/accounts_settings.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 3bc183151c0..96a1e858fb6 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -198,10 +198,12 @@ }, { "default": "1", + "description": "System will use the latest saved Currency Exchange rate on or before the transaction date, however old it is.
\nUncheck to ignore rates older than Stale Days and fetch a fresh rate from the exchange rate provider instead.", "fieldname": "allow_stale", "fieldtype": "Check", "in_list_view": 1, - "label": "Allow Stale Exchange Rates" + "label": "Allow Stale Exchange Rates", + "show_description_on_click": 1 }, { "default": "1", @@ -788,7 +790,11 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], +<<<<<<< HEAD "modified": "2026-07-27 12:00:00.000000", +======= + "modified": "2026-08-13 14:48:13.211701", +>>>>>>> 84cdd0daf0 (fix: describe stale exchange rate settings) "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Settings", From cbe7931b3bd4a822836bd9d1c3c7bbd79f6bc72b Mon Sep 17 00:00:00 2001 From: Khushi Rawat <142375893+khushi8112@users.noreply.github.com> Date: Thu, 13 Aug 2026 15:22:38 +0530 Subject: [PATCH 2/2] fix: conflicts --- .../accounts/doctype/accounts_settings/accounts_settings.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json index 96a1e858fb6..3177d377267 100644 --- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json +++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json @@ -790,11 +790,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-07-27 12:00:00.000000", -======= "modified": "2026-08-13 14:48:13.211701", ->>>>>>> 84cdd0daf0 (fix: describe stale exchange rate settings) "modified_by": "Administrator", "module": "Accounts", "name": "Accounts Settings",