From 83699ae61920308398c130b28a857f26a73d6ad3 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Thu, 20 Jun 2024 15:51:49 +0530 Subject: [PATCH 1/2] fix: hide label for twilio/whatsapp settings --- frontend/src/components/Settings/SettingsPage.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/components/Settings/SettingsPage.vue b/frontend/src/components/Settings/SettingsPage.vue index 8cbf42fa..d8949bdc 100644 --- a/frontend/src/components/Settings/SettingsPage.vue +++ b/frontend/src/components/Settings/SettingsPage.vue @@ -72,6 +72,7 @@ const sections = computed(() => { if (fieldsData[0].type !== 'Section Break') { _sections.push({ label: 'General', + hideLabel: true, columns: 1, fields: [], }) @@ -80,6 +81,7 @@ const sections = computed(() => { if (field.type === 'Section Break') { _sections.push({ label: field.value, + hideLabel: true, columns: 1, fields: [], }) From 2756530d423c921035492e9049f9f46dd667748f Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 26 Jun 2024 11:52:28 +0530 Subject: [PATCH 2/2] fix: add default sidebar fields layout --- crm/install.py | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/crm/install.py b/crm/install.py index 92d8a2ef..d46d1067 100644 --- a/crm/install.py +++ b/crm/install.py @@ -110,7 +110,7 @@ def add_default_communication_statuses(): doc.insert() def add_default_fields_layout(): - layouts = { + quick_entry_layouts = { "CRM Lead-Quick Entry": { "doctype": "CRM Lead", "layout": '[{"label":"Person","fields":["salutation","first_name","last_name","email","mobile_no", "gender"],"hideLabel":true},{"label":"Organization","fields":["organization","website","no_of_employees","territory","annual_revenue","industry"],"hideLabel":true,"hideBorder":false},{"label":"Other","columns":2,"fields":["status","lead_owner"],"hideLabel":true,"hideBorder":false}]' @@ -129,14 +129,35 @@ def add_default_fields_layout(): }, } - for layout in layouts: + sidebar_fields_layouts = { + "CRM Lead-Side Panel": { + "doctype": "CRM Lead", + "layout": '[{"label": "Details", "name": "details", "opened": true, "fields": ["organization", "website", "territory", "industry", "job_title", "source", "lead_owner"]}, {"label": "Person", "name": "person_tab", "opened": true, "fields": ["salutation", "first_name", "last_name", "email", "mobile_no"]}]' + }, + "CRM Deal-Side Panel": { + "doctype": "CRM Deal", + "layout": '[{"label":"Contacts","name":"contacts_section","opened":true,"editable":false,"contacts":[]},{"label":"Organization Details","name":"organization_tab","opened":true,"fields":["organization","website","territory","annual_revenue","close_date","probability","next_step","deal_owner"]}]' + }, + } + + for layout in quick_entry_layouts: if frappe.db.exists("CRM Fields Layout", layout): continue doc = frappe.new_doc("CRM Fields Layout") doc.type = "Quick Entry" - doc.dt = layouts[layout]["doctype"] - doc.layout = layouts[layout]["layout"] + doc.dt = quick_entry_layouts[layout]["doctype"] + doc.layout = quick_entry_layouts[layout]["layout"] + doc.insert() + + for layout in sidebar_fields_layouts: + if frappe.db.exists("CRM Fields Layout", layout): + continue + + doc = frappe.new_doc("CRM Fields Layout") + doc.type = "Side Panel" + doc.dt = sidebar_fields_layouts[layout]["doctype"] + doc.layout = sidebar_fields_layouts[layout]["layout"] doc.insert() def add_property_setter():