From 3feb8b322cf15cbbb914389560adda83f0e8f46e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 13:34:33 +0530
Subject: [PATCH 01/11] fix: render note/task modal only if show is true

---
 frontend/src/components/Modals/TaskModal.vue | 2 +-
 frontend/src/pages/Deals.vue                 | 2 ++
 frontend/src/pages/Leads.vue                 | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index 035fafea..7b082a3a 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -208,7 +208,7 @@ async function updateTask() {
 function render() {
   editMode.value = false
   nextTick(() => {
-    title.value.el.focus()
+    title.value?.el?.focus?.()
     _task.value = { ...props.task }
     if (_task.value.title) {
       editMode.value = true
diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index ceff66e4..53e69cb2 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -237,12 +237,14 @@
     :defaults="defaults"
   />
   <NoteModal
+    v-if="showNoteModal"
     v-model="showNoteModal"
     :note="note"
     doctype="CRM Deal"
     :doc="docname"
   />
   <TaskModal
+    v-if="showTaskModal"
     v-model="showTaskModal"
     :task="task"
     doctype="CRM Deal"
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index 097b4ac2..599f6634 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -263,12 +263,14 @@
     :defaults="defaults"
   />
   <NoteModal
+    v-if="showNoteModal"
     v-model="showNoteModal"
     :note="note"
     doctype="CRM Lead"
     :doc="docname"
   />
   <TaskModal
+    v-if="showTaskModal"
     v-model="showTaskModal"
     :task="task"
     doctype="CRM Lead"

From 11f244a05a2d907e46bdaefd46d1d2e1021b3645 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 13:46:57 +0530
Subject: [PATCH 02/11] fix: do not allow export in kanban view

---
 frontend/src/components/ViewControls.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue
index 73c5a698..d143db5e 100644
--- a/frontend/src/components/ViewControls.vue
+++ b/frontend/src/components/ViewControls.vue
@@ -181,7 +181,9 @@
           @update="(isDefault) => updateColumns(isDefault)"
         />
         <Dropdown
-          v-if="!options.hideColumnsButton"
+          v-if="
+            !options.hideColumnsButton && route.params.viewType !== 'kanban'
+          "
           :options="[
             {
               group: __('Options'),

From c3652b38ebb89c20764c223ae6ef80054adbdb6b Mon Sep 17 00:00:00 2001
From: Abraham Kalungi <85731451+kalungia@users.noreply.github.com>
Date: Mon, 1 Jul 2024 10:50:16 +0200
Subject: [PATCH 03/11] add: defaults for industry and lead source

---
 crm/install.py | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/crm/install.py b/crm/install.py
index cd36f1f6..bf38d556 100644
--- a/crm/install.py
+++ b/crm/install.py
@@ -16,6 +16,8 @@ def after_install():
 	add_default_fields_layout()
 	add_property_setter()
 	add_email_template_custom_fields()
+	add_default_industries()
+	add_default_lead_sources()
 	frappe.db.commit()
 
 def add_default_lead_statuses():
@@ -196,3 +198,28 @@ def add_email_template_custom_fields():
 		)
 
 		frappe.clear_cache(doctype="Email Template")
+
+
+def add_default_industries():
+	industries = ["Accounting", "Advertising", "Aerospace", "Agriculture", "Airline", "Apparel & Accessories", "Automotive", "Banking", "Biotechnology", "Broadcasting", "Brokerage", "Chemical", "Computer", "Consulting", "Consumer Products", "Cosmetics", "Defense", "Department Stores", "Education", "Electronics", "Energy", "Entertainment & Leisure, Executive Search", "Financial Services", "Food", "Beverage & Tobacco", "Grocery", "Health Care", "Internet Publishing", "Investment Banking", "Legal", "Manufacturing", "Motion Picture & Video", "Music", "Newspaper Publishers", "Online Auctions", "Pension Funds", "Pharmaceuticals", "Private Equity", "Publishing", "Real Estate", "Retail & Wholesale", "Securities & Commodity Exchanges", "Service", "Soap & Detergent", "Software", "Sports", "Technology", "Telecommunications", "Television", "Transportation", "Venture Capital"]
+
+	for rec in industries:
+		if frappe.db.exists("CRM Industry", rec):
+			continue
+
+		doc = frappe.new_doc("CRM Industry")
+		doc.industry = rec
+		doc.insert()
+
+
+def add_default_lead_sources():
+
+	lead_sources = ["Existing Customer", "Reference", "Advertisement", "Cold Calling", "Exhibition", "Supplier Reference", "Mass Mailing", "Customer's Vendor", "Campaign", "Walk In"]
+
+	for source in lead_sources:
+		if frappe.db.exists("CRM Lead Source", source):
+			continue
+
+		doc = frappe.new_doc("CRM Lead Source")
+		doc.source_name = source
+		doc.insert()

From 57a954eb9abbae201b39c0b79d539ef23b39106d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 15:14:29 +0530
Subject: [PATCH 04/11] fix: column delete not working

---
 frontend/src/components/Kanban/KanbanView.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Kanban/KanbanView.vue b/frontend/src/components/Kanban/KanbanView.vue
index d8136501..b6364e63 100644
--- a/frontend/src/components/Kanban/KanbanView.vue
+++ b/frontend/src/components/Kanban/KanbanView.vue
@@ -198,10 +198,10 @@ function actions(column) {
   ]
 }
 
-function updateColumn({ item, from, to }) {
-  let toColumn = to?.dataset.column
-  let fromColumn = from?.dataset.column
-  let itemName = item?.dataset.name
+function updateColumn(d) {
+  let toColumn = d?.to?.dataset.column
+  let fromColumn = d?.from?.dataset.column
+  let itemName = d?.item?.dataset.name
 
   let _columns = []
   columns.value.forEach((col) => {

From 98cc43b683749cc1d48f7d4f242ae3e71b1247d2 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 16:17:51 +0530
Subject: [PATCH 05/11] fix: add/delete column in kanban

---
 crm/api/doc.py                                |   4 +-
 frontend/src/components/Kanban/KanbanView.vue | 305 ++++++++++--------
 2 files changed, 173 insertions(+), 136 deletions(-)

diff --git a/crm/api/doc.py b/crm/api/doc.py
index 8505a7a8..b779a126 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -332,7 +332,8 @@ def get_data(
 
 		for kc in kanban_columns:
 			column_filters = { column_field: kc.get('name') }
-			if column_field in filters and filters.get(column_field) != kc.name:
+			order = kc.get("order")
+			if column_field in filters and filters.get(column_field) != kc.name or kc.get('delete'):
 				column_data = []
 			else:
 				column_filters.update(filters.copy())
@@ -341,7 +342,6 @@ def get_data(
 				if kc.get("page_length"):
 					page_length = kc.get("page_length")
 
-				order = kc.get("order")
 				if order:
 					column_data = get_records_based_on_order(doctype, rows, column_filters, page_length, order)
 				else:
diff --git a/frontend/src/components/Kanban/KanbanView.vue b/frontend/src/components/Kanban/KanbanView.vue
index b6364e63..1001d4e0 100644
--- a/frontend/src/components/Kanban/KanbanView.vue
+++ b/frontend/src/components/Kanban/KanbanView.vue
@@ -1,145 +1,169 @@
 <template>
-  <Draggable
-    v-if="columns"
-    :list="columns"
-    item-key="column"
-    @end="updateColumn"
-    class="flex sm:mx-2.5 mx-2 pb-3.5 overflow-x-auto"
-  >
-    <template #item="{ element: column }">
-      <div
-        v-if="!column.delete"
-        class="flex flex-col gap-2.5 min-w-72 w-72 hover:bg-gray-100 rounded-lg p-2.5"
-      >
-        <div class="flex gap-2 items-center group justify-between">
-          <div class="flex items-center text-base">
-            <NestedPopover>
-              <template #target>
-                <Button variant="ghost" size="sm" class="hover:!bg-gray-100">
-                  <IndicatorIcon
-                    :class="colorClasses(column.column.color, true)"
-                  />
-                </Button>
-              </template>
-              <template #body="{ close }">
-                <div
-                  class="flex flex-col gap-3 px-3 py-2.5 rounded-lg border border-gray-100 bg-white shadow-xl"
-                >
-                  <div class="flex gap-1">
-                    <Button
-                      :class="colorClasses(color)"
-                      variant="ghost"
-                      v-for="color in colors"
-                      :key="color"
-                      @click="() => (column.column.color = color)"
-                    >
-                      <IndicatorIcon />
-                    </Button>
-                  </div>
-                  <div class="flex flex-row-reverse">
-                    <Button
-                      variant="solid"
-                      :label="__('Apply')"
-                      @click="updateColumn"
+  <div class="flex overflow-x-auto">
+    <Draggable
+      v-if="columns"
+      :list="columns"
+      item-key="column"
+      @end="updateColumn"
+      class="flex sm:mx-2.5 mx-2 pb-3.5"
+    >
+      <template #item="{ element: column }">
+        <div
+          v-if="!column.column.delete"
+          class="flex flex-col gap-2.5 min-w-72 w-72 hover:bg-gray-100 rounded-lg p-2.5"
+        >
+          <div class="flex gap-2 items-center group justify-between">
+            <div class="flex items-center text-base">
+              <NestedPopover>
+                <template #target>
+                  <Button variant="ghost" size="sm" class="hover:!bg-gray-100">
+                    <IndicatorIcon
+                      :class="colorClasses(column.column.color, true)"
                     />
-                  </div>
-                </div>
-              </template>
-            </NestedPopover>
-            <div>{{ column.column.name }}</div>
-          </div>
-          <div class="flex">
-            <Dropdown :options="actions(column)">
-              <template #default>
-                <Button
-                  class="hidden group-hover:flex"
-                  icon="more-horizontal"
-                  variant="ghost"
-                />
-              </template>
-            </Dropdown>
-            <Button
-              icon="plus"
-              variant="ghost"
-              @click="options.onNewClick(column)"
-            />
-          </div>
-        </div>
-        <div class="overflow-y-auto flex flex-col gap-2 h-full">
-          <Draggable
-            :list="column.data"
-            group="fields"
-            item-key="name"
-            class="flex flex-col gap-3.5 flex-1"
-            @end="updateColumn"
-            :data-column="column.column.name"
-          >
-            <template #item="{ element: fields }">
-              <component
-                :is="options.getRoute ? 'router-link' : 'div'"
-                class="pt-3 px-3.5 pb-2.5 rounded-lg border bg-white text-base flex flex-col"
-                :data-name="fields.name"
-                v-bind="{
-                  to: options.getRoute ? options.getRoute(fields) : undefined,
-                  onClick: options.onClick
-                    ? () => options.onClick(fields)
-                    : undefined,
-                }"
-              >
-                <slot
-                  name="title"
-                  v-bind="{ fields, titleField, itemName: fields.name }"
-                >
-                  <div class="h-5 flex items-center">
-                    <div v-if="fields[titleField]">
-                      {{ fields[titleField] }}
+                  </Button>
+                </template>
+                <template #body="{ close }">
+                  <div
+                    class="flex flex-col gap-3 px-3 py-2.5 rounded-lg border border-gray-100 bg-white shadow-xl"
+                  >
+                    <div class="flex gap-1">
+                      <Button
+                        :class="colorClasses(color)"
+                        variant="ghost"
+                        v-for="color in colors"
+                        :key="color"
+                        @click="() => (column.column.color = color)"
+                      >
+                        <IndicatorIcon />
+                      </Button>
+                    </div>
+                    <div class="flex flex-row-reverse">
+                      <Button
+                        variant="solid"
+                        :label="__('Apply')"
+                        @click="updateColumn"
+                      />
                     </div>
-                    <div class="text-gray-500" v-else>{{ __('No Title') }}</div>
                   </div>
-                </slot>
-                <div class="border-b h-px my-2.5" />
-
-                <div class="flex flex-col gap-3.5">
-                  <template v-for="value in column.fields" :key="value">
-                    <slot
-                      name="fields"
-                      v-bind="{
-                        fields,
-                        fieldName: value,
-                        itemName: fields.name,
-                      }"
-                    >
-                      <div v-if="fields[value]" class="truncate">
-                        {{ fields[value] }}
+                </template>
+              </NestedPopover>
+              <div>{{ column.column.name }}</div>
+            </div>
+            <div class="flex">
+              <Dropdown :options="actions(column)">
+                <template #default>
+                  <Button
+                    class="hidden group-hover:flex"
+                    icon="more-horizontal"
+                    variant="ghost"
+                  />
+                </template>
+              </Dropdown>
+              <Button
+                icon="plus"
+                variant="ghost"
+                @click="options.onNewClick(column)"
+              />
+            </div>
+          </div>
+          <div class="overflow-y-auto flex flex-col gap-2 h-full">
+            <Draggable
+              :list="column.data"
+              group="fields"
+              item-key="name"
+              class="flex flex-col gap-3.5 flex-1"
+              @end="updateColumn"
+              :data-column="column.column.name"
+            >
+              <template #item="{ element: fields }">
+                <component
+                  :is="options.getRoute ? 'router-link' : 'div'"
+                  class="pt-3 px-3.5 pb-2.5 rounded-lg border bg-white text-base flex flex-col"
+                  :data-name="fields.name"
+                  v-bind="{
+                    to: options.getRoute ? options.getRoute(fields) : undefined,
+                    onClick: options.onClick
+                      ? () => options.onClick(fields)
+                      : undefined,
+                  }"
+                >
+                  <slot
+                    name="title"
+                    v-bind="{ fields, titleField, itemName: fields.name }"
+                  >
+                    <div class="h-5 flex items-center">
+                      <div v-if="fields[titleField]">
+                        {{ fields[titleField] }}
                       </div>
-                    </slot>
-                  </template>
-                </div>
-                <div class="border-b h-px mt-2.5 mb-2" />
-                <slot name="actions" v-bind="{ itemName: fields.name }">
-                  <div class="flex gap-2 items-center justify-between">
-                    <div></div>
-                    <Button icon="plus" variant="ghost" @click.stop.prevent />
+                      <div class="text-gray-500" v-else>
+                        {{ __('No Title') }}
+                      </div>
+                    </div>
+                  </slot>
+                  <div class="border-b h-px my-2.5" />
+
+                  <div class="flex flex-col gap-3.5">
+                    <template v-for="value in column.fields" :key="value">
+                      <slot
+                        name="fields"
+                        v-bind="{
+                          fields,
+                          fieldName: value,
+                          itemName: fields.name,
+                        }"
+                      >
+                        <div v-if="fields[value]" class="truncate">
+                          {{ fields[value] }}
+                        </div>
+                      </slot>
+                    </template>
                   </div>
-                </slot>
-              </component>
-            </template>
-          </Draggable>
-          <div
-            v-if="column.column.count < column.column.all_count"
-            class="flex items-center justify-center"
-          >
-            <Button
-              :label="__('Load More')"
-              @click="emit('loadMore', column.column.name)"
-            />
+                  <div class="border-b h-px mt-2.5 mb-2" />
+                  <slot name="actions" v-bind="{ itemName: fields.name }">
+                    <div class="flex gap-2 items-center justify-between">
+                      <div></div>
+                      <Button icon="plus" variant="ghost" @click.stop.prevent />
+                    </div>
+                  </slot>
+                </component>
+              </template>
+            </Draggable>
+            <div
+              v-if="column.column.count < column.column.all_count"
+              class="flex items-center justify-center"
+            >
+              <Button
+                :label="__('Load More')"
+                @click="emit('loadMore', column.column.name)"
+              />
+            </div>
           </div>
         </div>
-      </div>
-    </template>
-  </Draggable>
+      </template>
+    </Draggable>
+    <div v-if="deletedColumns.length" class="shrink-0 min-w-64">
+      <Autocomplete
+        value=""
+        :options="deletedColumns"
+        @change="(e) => addColumn(e)"
+      >
+        <template #target="{ togglePopover }">
+          <Button
+            class="w-full mt-2.5 mb-1 mr-5"
+            @click="togglePopover()"
+            :label="__('Add Column')"
+          >
+            <template #prefix>
+              <FeatherIcon name="plus" class="h-4" />
+            </template>
+          </Button>
+        </template>
+      </Autocomplete>
+    </div>
+  </div>
 </template>
 <script setup>
+import Autocomplete from '@/components/frappe-ui/Autocomplete.vue'
 import NestedPopover from '@/components/NestedPopover.vue'
 import IndicatorIcon from '@/components/Icons/IndicatorIcon.vue'
 import Draggable from 'vuedraggable'
@@ -179,6 +203,14 @@ const columns = computed(() => {
   return _columns
 })
 
+const deletedColumns = computed(() => {
+  return columns.value
+    .filter((col) => col.column['delete'])
+    .map((col) => {
+      return { label: col.column.name, value: col.column.name }
+    })
+})
+
 function actions(column) {
   return [
     {
@@ -189,7 +221,7 @@ function actions(column) {
           label: __('Delete'),
           icon: 'trash-2',
           onClick: () => {
-            column['delete'] = true
+            column.column['delete'] = true
             updateColumn()
           },
         },
@@ -198,6 +230,12 @@ function actions(column) {
   ]
 }
 
+function addColumn(e) {
+  let column = columns.value.find((col) => col.column.name == e.value)
+  column.column['delete'] = false
+  updateColumn()
+}
+
 function updateColumn(d) {
   let toColumn = d?.to?.dataset.column
   let fromColumn = d?.from?.dataset.column
@@ -205,7 +243,6 @@ function updateColumn(d) {
 
   let _columns = []
   columns.value.forEach((col) => {
-    if (col.delete) return
     col.column['order'] = col.data.map((d) => d.name)
     if (col.column.page_length) {
       delete col.column.page_length

From 5028909078bf3257141bf295b052ccd2a72688e6 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 17:41:45 +0530
Subject: [PATCH 06/11] fix: value is null causing issue while converting
 filter

---
 frontend/src/components/Filter.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/Filter.vue b/frontend/src/components/Filter.vue
index a67bf7c4..5a44c11c 100644
--- a/frontend/src/components/Filter.vue
+++ b/frontend/src/components/Filter.vue
@@ -67,7 +67,7 @@
               </div>
               <div id="value" class="w-full">
                 <component
-                  :is="getValSelect(f)"
+                  :is="getValueControl(f)"
                   v-model="f.value"
                   @change.stop="(v) => updateValue(v, f)"
                   :placeholder="__('John Doe')"
@@ -100,7 +100,7 @@
                 </div>
                 <div id="value" class="!min-w-[140px]">
                   <component
-                    :is="getValSelect(f)"
+                    :is="getValueControl(f)"
                     v-model="f.value"
                     @change="(v) => updateValue(v, f)"
                     :placeholder="__('John Doe')"
@@ -242,7 +242,7 @@ function convertFilters(data, allFilters) {
   let f = []
   for (let [key, value] of Object.entries(allFilters)) {
     let field = data.find((f) => f.fieldname === key)
-    if (typeof value !== 'object') {
+    if (typeof value !== 'object' || !value) {
       value = ['=', value]
       if (field?.fieldtype === 'Check') {
         value = ['equals', value[1] ? 'Yes' : 'No']
@@ -273,7 +273,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('In'), value: 'in' },
         { label: __('Not In'), value: 'not in' },
         { label: __('Is'), value: 'is' },
-      ]
+      ],
     )
   }
   if (fieldname === '_assign') {
@@ -298,7 +298,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('>'), value: '>' },
         { label: __('<='), value: '<=' },
         { label: __('>='), value: '>=' },
-      ]
+      ],
     )
   }
   if (typeSelect.includes(fieldtype)) {
@@ -309,7 +309,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('In'), value: 'in' },
         { label: __('Not In'), value: 'not in' },
         { label: __('Is'), value: 'is' },
-      ]
+      ],
     )
   }
   if (typeLink.includes(fieldtype)) {
@@ -322,7 +322,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('In'), value: 'in' },
         { label: __('Not In'), value: 'not in' },
         { label: __('Is'), value: 'is' },
-      ]
+      ],
     )
   }
   if (typeCheck.includes(fieldtype)) {
@@ -336,7 +336,7 @@ function getOperators(fieldtype, fieldname) {
         { label: __('In'), value: 'in' },
         { label: __('Not In'), value: 'not in' },
         { label: __('Is'), value: 'is' },
-      ]
+      ],
     )
   }
   if (typeDate.includes(fieldtype)) {
@@ -351,13 +351,13 @@ function getOperators(fieldtype, fieldname) {
         { label: __('<='), value: '<=' },
         { label: __('Between'), value: 'between' },
         { label: __('Timespan'), value: 'timespan' },
-      ]
+      ],
     )
   }
   return options
 }
 
-function getValSelect(f) {
+function getValueControl(f) {
   const { field, operator } = f
   const { fieldtype, options } = field
   if (operator == 'is') {

From aeb455894f642d13785dd58c8c6b566203a8144e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 17:42:12 +0530
Subject: [PATCH 07/11] build(deps): bump frappeui to 0.1.63

---
 frappe-ui             | 2 +-
 frontend/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe-ui b/frappe-ui
index 0c0212cc..b5cc6c0c 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 0c0212cc5bbac151cffc6dc73dfbdf7b69d45ec2
+Subproject commit b5cc6c0cd36ee25e8e945e8c91d8b5c035fb5e44
diff --git a/frontend/package.json b/frontend/package.json
index 7a839c81..4f46436b 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,7 +13,7 @@
     "@vueuse/core": "^10.3.0",
     "@vueuse/integrations": "^10.3.0",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.61",
+    "frappe-ui": "^0.1.63",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",

From 879fbb231d5308ded436b049e7c0a5b623cd8c56 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 18:17:09 +0530
Subject: [PATCH 08/11] fix: only show Auth token & Account SID rest make read
 only

---
 crm/api/doc.py                                |  5 ++-
 .../twilio_settings/twilio_settings.json      | 31 +++++++++++++------
 frontend/src/components/Fields.vue            |  8 +++++
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/crm/api/doc.py b/crm/api/doc.py
index b779a126..e0a0da26 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -667,9 +667,6 @@ def get_fields(doctype: str, allow_all_fieldtypes: bool = False):
 	for field in fields:
 		if (
 			field.fieldtype not in not_allowed_fieldtypes
-			and not field.hidden
-			and not field.read_only
-			and not field.is_virtual
 			and field.fieldname
 		):
 			_fields.append({
@@ -678,6 +675,8 @@ def get_fields(doctype: str, allow_all_fieldtypes: bool = False):
 				"value": field.fieldname,
 				"options": field.options,
 				"mandatory": field.reqd,
+				"read_only": field.read_only,
+				"hidden": field.hidden,
 			})
 
 	return _fields
diff --git a/crm/fcrm/doctype/twilio_settings/twilio_settings.json b/crm/fcrm/doctype/twilio_settings/twilio_settings.json
index 24567b4a..e32ca05f 100644
--- a/crm/fcrm/doctype/twilio_settings/twilio_settings.json
+++ b/crm/fcrm/doctype/twilio_settings/twilio_settings.json
@@ -11,13 +11,15 @@
   "enabled",
   "column_break_avmt",
   "record_calls",
-  "section_break_malx",
+  "section_break_eklq",
   "account_sid",
-  "api_key",
-  "api_secret",
-  "column_break_idds",
+  "column_break_yqvr",
   "auth_token",
-  "twiml_sid"
+  "section_break_malx",
+  "api_key",
+  "twiml_sid",
+  "column_break_idds",
+  "api_secret"
  ],
  "fields": [
   {
@@ -31,13 +33,15 @@
    "fieldname": "api_key",
    "fieldtype": "Data",
    "label": "API Key",
-   "permlevel": 1
+   "permlevel": 1,
+   "read_only": 1
   },
   {
    "fieldname": "api_secret",
    "fieldtype": "Password",
    "label": "API Secret",
-   "permlevel": 1
+   "permlevel": 1,
+   "read_only": 1
   },
   {
    "fieldname": "column_break_idds",
@@ -54,7 +58,8 @@
    "fieldname": "twiml_sid",
    "fieldtype": "Data",
    "label": "TwiML SID",
-   "permlevel": 1
+   "permlevel": 1,
+   "read_only": 1
   },
   {
    "fieldname": "section_break_ssqj",
@@ -79,12 +84,20 @@
    "fieldname": "enabled",
    "fieldtype": "Check",
    "label": "Enabled"
+  },
+  {
+   "fieldname": "section_break_eklq",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_yqvr",
+   "fieldtype": "Column Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-06-11 17:42:38.256260",
+ "modified": "2024-07-01 17:55:25.003703",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "Twilio Settings",
diff --git a/frontend/src/components/Fields.vue b/frontend/src/components/Fields.vue
index 238b3ada..b51e0446 100644
--- a/frontend/src/components/Fields.vue
+++ b/frontend/src/components/Fields.vue
@@ -33,6 +33,7 @@
             :options="field.options"
             v-model="data[field.name]"
             :placeholder="__(field.placeholder || field.label)"
+            :disabled="Boolean(field.read_only)"
           >
             <template v-if="field.prefix" #prefix>
               <IndicatorIcon :class="field.prefix" />
@@ -65,6 +66,7 @@
             @change="(v) => (data[field.name] = v)"
             :placeholder="__(field.placeholder || field.label)"
             :onCreate="field.create"
+            :disabled="Boolean(field.read_only)"
           />
           <Link
             v-else-if="field.type === 'User'"
@@ -74,6 +76,7 @@
             @change="(v) => (data[field.name] = v)"
             :placeholder="__(field.placeholder || field.label)"
             :hideMe="true"
+            :disabled="Boolean(field.read_only)"
           >
             <template #prefix>
               <UserAvatar class="mr-2" :user="data[field.name]" size="sm" />
@@ -143,30 +146,35 @@
             v-model="data[field.name]"
             :placeholder="__(field.placeholder || field.label)"
             input-class="border-none"
+            :disabled="Boolean(field.read_only)"
           />
           <DatePicker
             v-else-if="field.type === 'Date'"
             v-model="data[field.name]"
             :placeholder="__(field.placeholder || field.label)"
             input-class="border-none"
+            :disabled="Boolean(field.read_only)"
           />
           <FormControl
             v-else-if="['Small Text', 'Text', 'Long Text'].includes(field.type)"
             type="textarea"
             :placeholder="__(field.placeholder || field.label)"
             v-model="data[field.name]"
+            :disabled="Boolean(field.read_only)"
           />
           <FormControl
             v-else-if="['Int'].includes(field.type)"
             type="number"
             :placeholder="__(field.placeholder || field.label)"
             v-model="data[field.name]"
+            :disabled="Boolean(field.read_only)"
           />
           <FormControl
             v-else
             type="text"
             :placeholder="__(field.placeholder || field.label)"
             v-model="data[field.name]"
+            :disabled="Boolean(field.read_only)"
           />
         </div>
       </div>

From 4c98bc84e724ae4393257ca0843f7586b0ad7a2f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 18:17:34 +0530
Subject: [PATCH 09/11] fix: typeerrors fix

---
 frontend/src/components/ListBulkActions.vue        | 7 ++++---
 frontend/src/components/Modals/AssignmentModal.vue | 4 ++--
 frontend/src/components/Modals/EditValueModal.vue  | 5 ++++-
 frontend/src/pages/Deal.vue                        | 6 +++---
 frontend/src/pages/Lead.vue                        | 6 +++---
 frontend/src/pages/MobileDeal.vue                  | 6 +++---
 frontend/src/pages/MobileLead.vue                  | 6 +++---
 7 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/ListBulkActions.vue b/frontend/src/components/ListBulkActions.vue
index 6b54b15d..5b5bfdaa 100644
--- a/frontend/src/components/ListBulkActions.vue
+++ b/frontend/src/components/ListBulkActions.vue
@@ -1,16 +1,17 @@
 <template>
   <EditValueModal
+    v-if="showEditModal"
     v-model="showEditModal"
     :doctype="doctype"
     :selectedValues="selectedValues"
     @reload="reload"
   />
   <AssignmentModal
-    v-if="selectedValues"
-    :docs="selectedValues"
-    :doctype="doctype"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="bulkAssignees"
+    :docs="selectedValues"
+    :doctype="doctype"
     @reload="reload"
   />
 </template>
diff --git a/frontend/src/components/Modals/AssignmentModal.vue b/frontend/src/components/Modals/AssignmentModal.vue
index 0e1a9682..0028e8f7 100644
--- a/frontend/src/components/Modals/AssignmentModal.vue
+++ b/frontend/src/components/Modals/AssignmentModal.vue
@@ -85,8 +85,8 @@ const props = defineProps({
     default: null,
   },
   docs: {
-    type: Array,
-    default: () => [],
+    type: Set,
+    default: new Set(),
   },
   doctype: {
     type: String,
diff --git a/frontend/src/components/Modals/EditValueModal.vue b/frontend/src/components/Modals/EditValueModal.vue
index 43540602..039f4eca 100644
--- a/frontend/src/components/Modals/EditValueModal.vue
+++ b/frontend/src/components/Modals/EditValueModal.vue
@@ -52,7 +52,7 @@ const props = defineProps({
     required: true,
   },
   selectedValues: {
-    type: Array,
+    type: Set,
     required: true,
   },
 })
@@ -67,6 +67,9 @@ const fields = createResource({
   params: {
     doctype: props.doctype,
   },
+  transform: (data) => {
+    return data.filter((f) => f.hidden == 0 && f.read_only == 0)
+  }
 })
 
 onMounted(() => {
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index a3e292dd..bbf63456 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -278,11 +278,11 @@
     }"
   />
   <AssignmentModal
-    v-if="deal.data"
-    :doc="deal.data"
-    doctype="CRM Deal"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="deal.data._assignedTo"
+    :doc="deal.data"
+    doctype="CRM Deal"
   />
 </template>
 <script setup>
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index cddfdab9..dccf8a47 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -185,11 +185,11 @@
     </Resizer>
   </div>
   <AssignmentModal
-    v-if="lead.data"
-    :doc="lead.data"
-    doctype="CRM Lead"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="lead.data._assignedTo"
+    :doc="lead.data"
+    doctype="CRM Lead"
   />
   <Dialog
     v-model="showConvertToDealModal"
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index 182b7219..fb6ba895 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -237,11 +237,11 @@
     }"
   />
   <AssignmentModal
-    v-if="deal.data"
-    :doc="deal.data"
-    doctype="CRM Deal"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="deal.data._assignedTo"
+    :doc="deal.data"
+    doctype="CRM Deal"
   />
 </template>
 <script setup>
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index 76212e12..4ebd15f0 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -96,11 +96,11 @@
     </Tabs>
   </div>
   <AssignmentModal
-    v-if="lead.data"
-    :doc="lead.data"
-    doctype="CRM Lead"
+    v-if="showAssignmentModal"
     v-model="showAssignmentModal"
     v-model:assignees="lead.data._assignedTo"
+    :doc="lead.data"
+    doctype="CRM Lead"
   />
   <Dialog
     v-model="showConvertToDealModal"

From 026650a6eb4bc574daaa48bf2a205d4709056e5a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Mon, 1 Jul 2024 18:20:43 +0530
Subject: [PATCH 10/11] chore: better variable name

---
 crm/install.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crm/install.py b/crm/install.py
index bf38d556..1cbdb66d 100644
--- a/crm/install.py
+++ b/crm/install.py
@@ -203,12 +203,12 @@ def add_email_template_custom_fields():
 def add_default_industries():
 	industries = ["Accounting", "Advertising", "Aerospace", "Agriculture", "Airline", "Apparel & Accessories", "Automotive", "Banking", "Biotechnology", "Broadcasting", "Brokerage", "Chemical", "Computer", "Consulting", "Consumer Products", "Cosmetics", "Defense", "Department Stores", "Education", "Electronics", "Energy", "Entertainment & Leisure, Executive Search", "Financial Services", "Food", "Beverage & Tobacco", "Grocery", "Health Care", "Internet Publishing", "Investment Banking", "Legal", "Manufacturing", "Motion Picture & Video", "Music", "Newspaper Publishers", "Online Auctions", "Pension Funds", "Pharmaceuticals", "Private Equity", "Publishing", "Real Estate", "Retail & Wholesale", "Securities & Commodity Exchanges", "Service", "Soap & Detergent", "Software", "Sports", "Technology", "Telecommunications", "Television", "Transportation", "Venture Capital"]
 
-	for rec in industries:
-		if frappe.db.exists("CRM Industry", rec):
+	for industry in industries:
+		if frappe.db.exists("CRM Industry", industry):
 			continue
 
 		doc = frappe.new_doc("CRM Industry")
-		doc.industry = rec
+		doc.industry = industry
 		doc.insert()
 
 

From 2afe23de677cd13aab3f5379d3e5c14ab8821271 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 1 Jul 2024 19:15:20 +0530
Subject: [PATCH 11/11] fix: do not show empty read_only fields & hidden fields

---
 frontend/src/components/Fields.vue | 303 +++++++++++++++--------------
 1 file changed, 158 insertions(+), 145 deletions(-)

diff --git a/frontend/src/components/Fields.vue b/frontend/src/components/Fields.vue
index b51e0446..fe723d8b 100644
--- a/frontend/src/components/Fields.vue
+++ b/frontend/src/components/Fields.vue
@@ -21,161 +21,174 @@
         "
       >
         <div v-for="field in section.fields" :key="field.name">
-          <div v-if="field.type != 'Check'" class="mb-2 text-sm text-gray-600">
-            {{ __(field.label) }}
-            <span class="text-red-500" v-if="field.mandatory">*</span>
-          </div>
-          <FormControl
-            v-if="field.type === 'Select'"
-            type="select"
-            class="form-control"
-            :class="field.prefix ? 'prefix' : ''"
-            :options="field.options"
-            v-model="data[field.name]"
-            :placeholder="__(field.placeholder || field.label)"
-            :disabled="Boolean(field.read_only)"
-          >
-            <template v-if="field.prefix" #prefix>
-              <IndicatorIcon :class="field.prefix" />
-            </template>
-          </FormControl>
           <div
-            v-else-if="field.type == 'Check'"
-            class="flex items-center gap-2"
+            v-if="
+              field.type == 'Check' ||
+              (field.read_only && data[field.name]) ||
+              !field.read_only || !field.hidden
+            "
           >
-            <FormControl
-              class="form-control"
-              type="checkbox"
-              v-model="data[field.name]"
-              @change="(e) => (data[field.name] = e.target.checked)"
-              :disabled="Boolean(field.read_only)"
-            />
-            <label
-              class="text-sm text-gray-600"
-              @click="data[field.name] = !data[field.name]"
+            <div
+              v-if="field.type != 'Check'"
+              class="mb-2 text-sm text-gray-600"
             >
               {{ __(field.label) }}
               <span class="text-red-500" v-if="field.mandatory">*</span>
-            </label>
-          </div>
-          <Link
-            v-else-if="field.type === 'Link'"
-            class="form-control"
-            :value="data[field.name]"
-            :doctype="field.options"
-            @change="(v) => (data[field.name] = v)"
-            :placeholder="__(field.placeholder || field.label)"
-            :onCreate="field.create"
-            :disabled="Boolean(field.read_only)"
-          />
-          <Link
-            v-else-if="field.type === 'User'"
-            class="form-control"
-            :value="getUser(data[field.name]).full_name"
-            :doctype="field.options"
-            @change="(v) => (data[field.name] = v)"
-            :placeholder="__(field.placeholder || field.label)"
-            :hideMe="true"
-            :disabled="Boolean(field.read_only)"
-          >
-            <template #prefix>
-              <UserAvatar class="mr-2" :user="data[field.name]" size="sm" />
-            </template>
-            <template #item-prefix="{ option }">
-              <UserAvatar class="mr-2" :user="option.value" size="sm" />
-            </template>
-            <template #item-label="{ option }">
-              <Tooltip :text="option.value">
-                <div class="cursor-pointer">
-                  {{ getUser(option.value).full_name }}
-                </div>
-              </Tooltip>
-            </template>
-          </Link>
-          <div v-else-if="field.type === 'Dropdown'">
-            <NestedPopover>
-              <template #target="{ open }">
-                <Button
-                  :label="data[field.name]"
-                  class="dropdown-button flex w-full items-center justify-between rounded border border-gray-100 bg-gray-100 px-2 py-1.5 text-base text-gray-800 placeholder-gray-500 transition-colors hover:border-gray-200 hover:bg-gray-200 focus:border-gray-500 focus:bg-white focus:shadow-sm focus:outline-none focus:ring-0 focus-visible:ring-2 focus-visible:ring-gray-400"
-                >
-                  <div class="truncate">{{ data[field.name] }}</div>
-                  <template #suffix>
-                    <FeatherIcon
-                      :name="open ? 'chevron-up' : 'chevron-down'"
-                      class="h-4 text-gray-600"
-                    />
-                  </template>
-                </Button>
+            </div>
+            <FormControl
+              v-if="field.read_only && field.type !== 'Check'"
+              type="text"
+              :placeholder="__(field.placeholder || field.label)"
+              v-model="data[field.name]"
+              :disabled="true"
+            />
+            <FormControl
+              v-else-if="field.type === 'Select'"
+              type="select"
+              class="form-control"
+              :class="field.prefix ? 'prefix' : ''"
+              :options="field.options"
+              v-model="data[field.name]"
+              :placeholder="__(field.placeholder || field.label)"
+            >
+              <template v-if="field.prefix" #prefix>
+                <IndicatorIcon :class="field.prefix" />
               </template>
-              <template #body>
-                <div
-                  class="my-2 space-y-1.5 divide-y rounded-lg border border-gray-100 bg-white p-1.5 shadow-xl"
-                >
-                  <div>
-                    <DropdownItem
-                      v-if="field.options?.length"
-                      v-for="option in field.options"
-                      :key="option.name"
-                      :option="option"
-                    />
-                    <div v-else>
-                      <div class="p-1.5 px-7 text-base text-gray-500">
-                        {{ __('No {0} Available', [field.label]) }}
+            </FormControl>
+            <div
+              v-else-if="field.type == 'Check'"
+              class="flex items-center gap-2"
+            >
+              <FormControl
+                class="form-control"
+                type="checkbox"
+                v-model="data[field.name]"
+                @change="(e) => (data[field.name] = e.target.checked)"
+                :disabled="Boolean(field.read_only)"
+              />
+              <label
+                class="text-sm text-gray-600"
+                @click="data[field.name] = !data[field.name]"
+              >
+                {{ __(field.label) }}
+                <span class="text-red-500" v-if="field.mandatory">*</span>
+              </label>
+            </div>
+            <Link
+              v-else-if="field.type === 'Link'"
+              class="form-control"
+              :value="data[field.name]"
+              :doctype="field.options"
+              @change="(v) => (data[field.name] = v)"
+              :placeholder="__(field.placeholder || field.label)"
+              :onCreate="field.create"
+            />
+            <Link
+              v-else-if="field.type === 'User'"
+              class="form-control"
+              :value="getUser(data[field.name]).full_name"
+              :doctype="field.options"
+              @change="(v) => (data[field.name] = v)"
+              :placeholder="__(field.placeholder || field.label)"
+              :hideMe="true"
+            >
+              <template #prefix>
+                <UserAvatar class="mr-2" :user="data[field.name]" size="sm" />
+              </template>
+              <template #item-prefix="{ option }">
+                <UserAvatar class="mr-2" :user="option.value" size="sm" />
+              </template>
+              <template #item-label="{ option }">
+                <Tooltip :text="option.value">
+                  <div class="cursor-pointer">
+                    {{ getUser(option.value).full_name }}
+                  </div>
+                </Tooltip>
+              </template>
+            </Link>
+            <div v-else-if="field.type === 'Dropdown'">
+              <NestedPopover>
+                <template #target="{ open }">
+                  <Button
+                    :label="data[field.name]"
+                    class="dropdown-button flex w-full items-center justify-between rounded border border-gray-100 bg-gray-100 px-2 py-1.5 text-base text-gray-800 placeholder-gray-500 transition-colors hover:border-gray-200 hover:bg-gray-200 focus:border-gray-500 focus:bg-white focus:shadow-sm focus:outline-none focus:ring-0 focus-visible:ring-2 focus-visible:ring-gray-400"
+                  >
+                    <div class="truncate">{{ data[field.name] }}</div>
+                    <template #suffix>
+                      <FeatherIcon
+                        :name="open ? 'chevron-up' : 'chevron-down'"
+                        class="h-4 text-gray-600"
+                      />
+                    </template>
+                  </Button>
+                </template>
+                <template #body>
+                  <div
+                    class="my-2 space-y-1.5 divide-y rounded-lg border border-gray-100 bg-white p-1.5 shadow-xl"
+                  >
+                    <div>
+                      <DropdownItem
+                        v-if="field.options?.length"
+                        v-for="option in field.options"
+                        :key="option.name"
+                        :option="option"
+                      />
+                      <div v-else>
+                        <div class="p-1.5 px-7 text-base text-gray-500">
+                          {{ __('No {0} Available', [field.label]) }}
+                        </div>
                       </div>
                     </div>
+                    <div class="pt-1.5">
+                      <Button
+                        variant="ghost"
+                        class="w-full !justify-start"
+                        :label="__('Create New')"
+                        @click="field.create()"
+                      >
+                        <template #prefix>
+                          <FeatherIcon name="plus" class="h-4" />
+                        </template>
+                      </Button>
+                    </div>
                   </div>
-                  <div class="pt-1.5">
-                    <Button
-                      variant="ghost"
-                      class="w-full !justify-start"
-                      :label="__('Create New')"
-                      @click="field.create()"
-                    >
-                      <template #prefix>
-                        <FeatherIcon name="plus" class="h-4" />
-                      </template>
-                    </Button>
-                  </div>
-                </div>
-              </template>
-            </NestedPopover>
+                </template>
+              </NestedPopover>
+            </div>
+            <DateTimePicker
+              v-else-if="field.type === 'Datetime'"
+              v-model="data[field.name]"
+              :placeholder="__(field.placeholder || field.label)"
+              input-class="border-none"
+            />
+            <DatePicker
+              v-else-if="field.type === 'Date'"
+              v-model="data[field.name]"
+              :placeholder="__(field.placeholder || field.label)"
+              input-class="border-none"
+            />
+            <FormControl
+              v-else-if="
+                ['Small Text', 'Text', 'Long Text'].includes(field.type)
+              "
+              type="textarea"
+              :placeholder="__(field.placeholder || field.label)"
+              v-model="data[field.name]"
+            />
+            <FormControl
+              v-else-if="['Int'].includes(field.type)"
+              type="number"
+              :placeholder="__(field.placeholder || field.label)"
+              v-model="data[field.name]"
+            />
+            <FormControl
+              v-else
+              type="text"
+              :placeholder="__(field.placeholder || field.label)"
+              v-model="data[field.name]"
+              :disabled="Boolean(field.read_only)"
+            />
           </div>
-          <DateTimePicker
-            v-else-if="field.type === 'Datetime'"
-            v-model="data[field.name]"
-            :placeholder="__(field.placeholder || field.label)"
-            input-class="border-none"
-            :disabled="Boolean(field.read_only)"
-          />
-          <DatePicker
-            v-else-if="field.type === 'Date'"
-            v-model="data[field.name]"
-            :placeholder="__(field.placeholder || field.label)"
-            input-class="border-none"
-            :disabled="Boolean(field.read_only)"
-          />
-          <FormControl
-            v-else-if="['Small Text', 'Text', 'Long Text'].includes(field.type)"
-            type="textarea"
-            :placeholder="__(field.placeholder || field.label)"
-            v-model="data[field.name]"
-            :disabled="Boolean(field.read_only)"
-          />
-          <FormControl
-            v-else-if="['Int'].includes(field.type)"
-            type="number"
-            :placeholder="__(field.placeholder || field.label)"
-            v-model="data[field.name]"
-            :disabled="Boolean(field.read_only)"
-          />
-          <FormControl
-            v-else
-            type="text"
-            :placeholder="__(field.placeholder || field.label)"
-            v-model="data[field.name]"
-            :disabled="Boolean(field.read_only)"
-          />
         </div>
       </div>
     </div>