From e9314325cc3e2e2a8665f36220d658856b8e802a Mon Sep 17 00:00:00 2001 From: Gursheen Anand Date: Wed, 31 Jan 2024 13:37:01 +0530 Subject: [PATCH] fix: conditionally display show btn setting (cherry picked from commit 0c9572bb489c7b1cc12b38e3308f987dd61f162f) # Conflicts: # erpnext/buying/doctype/buying_settings/buying_settings.json --- erpnext/buying/doctype/buying_settings/buying_settings.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json index 77ce5f7d1935..7e57bbf2df6c 100644 --- a/erpnext/buying/doctype/buying_settings/buying_settings.json +++ b/erpnext/buying/doctype/buying_settings/buying_settings.json @@ -151,6 +151,7 @@ }, { "default": "1", + "depends_on": "eval: frappe.boot.versions && frappe.boot.versions.payments", "fieldname": "show_pay_button", "fieldtype": "Check", "label": "Show Pay Button in Purchase Order Portal" @@ -213,7 +214,11 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], +<<<<<<< HEAD "modified": "2024-01-30 14:04:43.177427", +======= + "modified": "2024-01-31 13:34:18.101256", +>>>>>>> 0c9572bb48 (fix: conditionally display show btn setting) "modified_by": "Administrator", "module": "Buying", "name": "Buying Settings",