diff --git a/crm/install.py b/crm/install.py index 473ba5f6..cced779d 100644 --- a/crm/install.py +++ b/crm/install.py @@ -192,7 +192,7 @@ def add_default_fields_layout(force=False): }, "CRM Deal-Data Fields": { "doctype": "CRM Deal", - "layout": '[{"label": "Details", "name": "details_section", "opened": true, "columns": [{"name": "column_z9XL", "fields": ["organization", "annual_revenue", "next_step"]}, {"name": "column_gM4w", "fields": ["website", "close_date", "deal_owner"]}, {"name": "column_gWmE", "fields": ["territory", "probability"]}]}]', + "layout": '[{"name":"first_tab","sections":[{"label":"Details","name":"details_section","opened":true,"columns":[{"name":"column_z9XL","fields":["organization","annual_revenue","next_step"]},{"name":"column_gM4w","fields":["website","closed_date","deal_owner"]},{"name":"column_gWmE","fields":["territory","probability"]}]},{"label":"Products","name":"section_jHhQ","opened":true,"columns":[{"name":"column_xiNF","fields":["products"]}],"editingLabel":false,"hideLabel":true},{"label":"New Section","name":"section_WNOQ","opened":true,"columns":[{"name":"column_ziBW","fields":["total"]},{"label":"","name":"column_wuwA","fields":["net_total"]}],"hideBorder":true,"hideLabel":true}]}]', }, } diff --git a/crm/patches.txt b/crm/patches.txt index 910f0fe1..c038f250 100644 --- a/crm/patches.txt +++ b/crm/patches.txt @@ -14,4 +14,5 @@ crm.patches.v1_0.update_layouts_to_new_format crm.patches.v1_0.move_twilio_agent_to_telephony_agent crm.patches.v1_0.create_default_scripts # 13-06-2025 crm.patches.v1_0.update_deal_status_probabilities -crm.patches.v1_0.update_deal_status_type \ No newline at end of file +crm.patches.v1_0.update_deal_status_type +crm.patches.v1_0.create_default_lost_reasons \ No newline at end of file diff --git a/crm/patches/v1_0/create_default_lost_reasons.py b/crm/patches/v1_0/create_default_lost_reasons.py new file mode 100644 index 00000000..f6e43e11 --- /dev/null +++ b/crm/patches/v1_0/create_default_lost_reasons.py @@ -0,0 +1,5 @@ +from crm.install import add_default_lost_reasons + + +def execute(): + add_default_lost_reasons() diff --git a/frappe-ui b/frappe-ui index b295b54a..136f2715 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit b295b54aaa3a2a22f455df819d87433dc6b9ff6a +Subproject commit 136f2715c2bd22b7390a2a02f1849a147d16b191 diff --git a/frontend/src/components/ColumnSettings.vue b/frontend/src/components/ColumnSettings.vue index 538c054f..0704a8e6 100644 --- a/frontend/src/components/ColumnSettings.vue +++ b/frontend/src/components/ColumnSettings.vue @@ -143,8 +143,9 @@ import ColumnsIcon from '@/components/Icons/ColumnsIcon.vue' import EditIcon from '@/components/Icons/EditIcon.vue' import DragIcon from '@/components/Icons/DragIcon.vue' import ReloadIcon from '@/components/Icons/ReloadIcon.vue' +import Autocomplete from '@/components/frappe-ui/Autocomplete.vue' import { isTouchScreenDevice } from '@/utils' -import { Autocomplete, Popover } from 'frappe-ui' +import { Popover } from 'frappe-ui' import Draggable from 'vuedraggable' import { computed, ref } from 'vue' import { watchOnce } from '@vueuse/core' @@ -209,6 +210,7 @@ const fields = computed(() => { }) function addColumn(c) { + if (!c) return let align = ['Float', 'Int', 'Percent', 'Currency'].includes(c.type) ? 'right' : 'left' diff --git a/frontend/src/components/Controls/Grid.vue b/frontend/src/components/Controls/Grid.vue index 0eda551e..17795432 100644 --- a/frontend/src/components/Controls/Grid.vue +++ b/frontend/src/components/Controls/Grid.vue @@ -52,10 +52,10 @@ > -
+
-
+
-
+