From a3a6efbcea768aae5c63d2dc83acccdb3b05a2a0 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 19 Aug 2026 16:59:07 +0530 Subject: [PATCH] fix: keep Currency and Price List section open for foreign currency (backport #58074) (#58113) * fix: keep Currency and Price List section open for foreign currency (#58074) The section is marked collapsible with no condition, so it always rendered collapsed. When the transaction currency differs from the company currency the exchange rate is relevant and was hidden behind a click. Adds collapsible_depends_on so the section starts expanded whenever the transaction currency differs from the company currency, and stays collapsed otherwise. (cherry picked from commit 4a8342496e526f92cc92b5457427df5c459a7286) # Conflicts: # erpnext/accounts/doctype/pos_invoice/pos_invoice.json # erpnext/accounts/doctype/sales_invoice/sales_invoice.json # erpnext/stock/doctype/delivery_note/delivery_note.json * fix: resolve unresolved cherry-pick conflict markers in modified timestamps Mergify's automatic cherry-pick of #58074 left conflict markers committed on the modified field, breaking JSON parsing. --------- Co-authored-by: Jatin3128 <140256508+Jatin3128@users.noreply.github.com> Co-authored-by: Jatin3128 --- erpnext/accounts/doctype/pos_invoice/pos_invoice.json | 3 ++- .../accounts/doctype/purchase_invoice/purchase_invoice.json | 3 ++- erpnext/accounts/doctype/sales_invoice/sales_invoice.json | 3 ++- erpnext/buying/doctype/purchase_order/purchase_order.json | 3 ++- .../buying/doctype/supplier_quotation/supplier_quotation.json | 3 ++- erpnext/selling/doctype/quotation/quotation.json | 3 ++- erpnext/selling/doctype/sales_order/sales_order.json | 3 ++- erpnext/stock/doctype/delivery_note/delivery_note.json | 3 ++- erpnext/stock/doctype/purchase_receipt/purchase_receipt.json | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json index 14c5153f0b9..4ff2ea1eb19 100644 --- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json +++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json @@ -497,6 +497,7 @@ }, { "collapsible": 1, + "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)", "depends_on": "customer", "fieldname": "currency_and_price_list", "fieldtype": "Section Break", @@ -1636,7 +1637,7 @@ "icon": "fa fa-file-text", "is_submittable": 1, "links": [], - "modified": "2026-05-28 12:22:50.253090", + "modified": "2026-08-12 12:00:00.000000", "modified_by": "Administrator", "module": "Accounts", "name": "POS Invoice", diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index d2c45a8681f..b28762f546b 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -504,6 +504,7 @@ }, { "collapsible": 1, + "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)", "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "label": "Currency and Price List", @@ -1703,7 +1704,7 @@ "idx": 204, "is_submittable": 1, "links": [], - "modified": "2026-08-05 15:40:16.519774", + "modified": "2026-08-12 12:00:00.000000", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index dd09e7b1fd8..c75b268d417 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -612,6 +612,7 @@ }, { "collapsible": 1, + "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)", "depends_on": "customer", "fieldname": "currency_and_price_list", "fieldtype": "Section Break", @@ -2364,7 +2365,7 @@ "link_fieldname": "consolidated_invoice" } ], - "modified": "2026-05-28 12:15:12.486443", + "modified": "2026-08-12 12:00:00.000000", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 47f355dff84..5020fe1ef15 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -388,6 +388,7 @@ }, { "collapsible": 1, + "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)", "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "label": "Currency and Price List", @@ -1323,7 +1324,7 @@ "idx": 105, "is_submittable": 1, "links": [], - "modified": "2026-05-28 12:34:19.659621", + "modified": "2026-08-12 12:00:00.000000", "modified_by": "Administrator", "module": "Buying", "name": "Purchase Order", diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index a5619bd5f0b..735d3753312 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -257,6 +257,7 @@ }, { "collapsible": 1, + "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)", "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "label": "Currency and Price List", @@ -947,7 +948,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], - "modified": "2026-05-28 12:29:37.509487", + "modified": "2026-08-12 12:00:00.000000", "modified_by": "Administrator", "module": "Buying", "name": "Supplier Quotation", diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index d7193d7637c..6faaa0b3dd0 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -341,6 +341,7 @@ }, { "collapsible": 1, + "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)", "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "label": "Currency and Price List", @@ -1136,7 +1137,7 @@ "idx": 82, "is_submittable": 1, "links": [], - "modified": "2026-05-30 17:40:02.667637", + "modified": "2026-08-12 12:00:00.000000", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 893485a7369..f3ca862c73f 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -478,6 +478,7 @@ }, { "collapsible": 1, + "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)", "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "hide_days": 1, @@ -1762,7 +1763,7 @@ "idx": 105, "is_submittable": 1, "links": [], - "modified": "2026-06-24 12:00:00.000000", + "modified": "2026-08-12 12:00:00.000000", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 5d156970ec4..45bcf39febc 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -426,6 +426,7 @@ }, { "collapsible": 1, + "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)", "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "label": "Currency and Price List", @@ -1461,7 +1462,7 @@ "idx": 146, "is_submittable": 1, "links": [], - "modified": "2026-05-28 11:44:37.286743", + "modified": "2026-08-12 12:00:00.000000", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index fa71e305e4b..1ab5c12fbd4 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -356,6 +356,7 @@ }, { "collapsible": 1, + "collapsible_depends_on": "eval:doc.currency && doc.currency != erpnext.get_currency(doc.company)", "fieldname": "currency_and_price_list", "fieldtype": "Section Break", "label": "Currency and Price List", @@ -1301,7 +1302,7 @@ "idx": 261, "is_submittable": 1, "links": [], - "modified": "2026-05-28 12:38:05.907578", + "modified": "2026-08-12 12:00:00.000000", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt",