From 020c2851789ab4ffcff2b445d3b4fc0ba5b92918 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Fri, 13 Sep 2024 15:21:25 +0530 Subject: [PATCH] fix: only show erpnext setting fields if enabled is set --- .../erpnext_crm_settings/erpnext_crm_settings.json | 8 ++++---- frontend/src/components/Fields.vue | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.json b/crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.json index 6d71314e..99a241c5 100644 --- a/crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.json +++ b/crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.json @@ -17,14 +17,14 @@ ], "fields": [ { - "depends_on": "eval:!doc.is_erpnext_in_the_current_site", + "depends_on": "eval:doc.enabled && !doc.is_erpnext_in_the_current_site", "fieldname": "api_key", "fieldtype": "Data", "label": "API Key", "mandatory_depends_on": "eval:!doc.is_erpnext_in_the_current_site" }, { - "depends_on": "eval:!doc.is_erpnext_in_the_current_site", + "depends_on": "eval:doc.enabled && !doc.is_erpnext_in_the_current_site", "fieldname": "api_secret", "fieldtype": "Data", "label": "API Secret", @@ -40,7 +40,7 @@ "fieldtype": "Column Break" }, { - "depends_on": "eval:!doc.is_erpnext_in_the_current_site", + "depends_on": "eval:doc.enabled && !doc.is_erpnext_in_the_current_site", "fieldname": "erpnext_site_url", "fieldtype": "Data", "label": "ERPNext Site URL", @@ -74,7 +74,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2024-09-12 18:14:44.323068", + "modified": "2024-09-13 15:06:23.317262", "modified_by": "Administrator", "module": "FCRM", "name": "ERPNext CRM Settings", diff --git a/frontend/src/components/Fields.vue b/frontend/src/components/Fields.vue index 80cea4ba..b6103bed 100644 --- a/frontend/src/components/Fields.vue +++ b/frontend/src/components/Fields.vue @@ -3,7 +3,7 @@