Merge pull request #238 from frappe/develop

chore: Merge develop to main

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:
@@ -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

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",
+  "column_break_yqvr",
-  "api_secret",
-  "column_break_idds",
   "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",

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 industry in industries:
+		if frappe.db.exists("CRM Industry", industry):
+			continue
+
+		doc = frappe.new_doc("CRM Industry")
+		doc.industry = industry
+		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()

frappe-ui

@@ -1 +1 @@
-Subproject commit 0c0212cc5bbac151cffc6dc73dfbdf7b69d45ec2
+Subproject commit b5cc6c0cd36ee25e8e945e8c91d8b5c035fb5e44

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",

frontend/src/components/Fields.vue

@@ -21,12 +21,29 @@
         "
       >
         <div v-for="field in section.fields" :key="field.name">
-          <div v-if="field.type != 'Check'" class="mb-2 text-sm text-gray-600">
+          <div
+            v-if="
+              field.type == 'Check' ||
+              (field.read_only && data[field.name]) ||
+              !field.read_only || !field.hidden
+            "
+          >
+            <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'"
+              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' : ''"
@@ -151,7 +168,9 @@
               input-class="border-none"
             />
             <FormControl
-            v-else-if="['Small Text', 'Text', 'Long Text'].includes(field.type)"
+              v-else-if="
+                ['Small Text', 'Text', 'Long Text'].includes(field.type)
+              "
               type="textarea"
               :placeholder="__(field.placeholder || field.label)"
               v-model="data[field.name]"
@@ -167,11 +186,13 @@
               type="text"
               :placeholder="__(field.placeholder || field.label)"
               v-model="data[field.name]"
+              :disabled="Boolean(field.read_only)"
             />
           </div>
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script setup>

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') {

frontend/src/components/Kanban/KanbanView.vue

@@ -1,14 +1,15 @@
 <template>
+  <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 overflow-x-auto"
+      class="flex sm:mx-2.5 mx-2 pb-3.5"
     >
       <template #item="{ element: column }">
         <div
-        v-if="!column.delete"
+          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">
@@ -94,7 +95,9 @@
                       <div v-if="fields[titleField]">
                         {{ fields[titleField] }}
                       </div>
-                    <div class="text-gray-500" v-else>{{ __('No Title') }}</div>
+                      <div class="text-gray-500" v-else>
+                        {{ __('No Title') }}
+                      </div>
                     </div>
                   </slot>
                   <div class="border-b h-px my-2.5" />
@@ -138,8 +141,29 @@
         </div>
       </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,14 +230,19 @@ function actions(column) {
   ]
 }
 
-function updateColumn({ item, from, to }) {
+function addColumn(e) {
-  let toColumn = to?.dataset.column
+  let column = columns.value.find((col) => col.column.name == e.value)
-  let fromColumn = from?.dataset.column
+  column.column['delete'] = false
-  let itemName = item?.dataset.name
+  updateColumn()
+}
+
+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) => {
-    if (col.delete) return
     col.column['order'] = col.data.map((d) => d.name)
     if (col.column.page_length) {
       delete col.column.page_length

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"
+    v-if="showAssignmentModal"
-    :docs="selectedValues"
-    :doctype="doctype"
     v-model="showAssignmentModal"
     v-model:assignees="bulkAssignees"
+    :docs="selectedValues"
+    :doctype="doctype"
     @reload="reload"
   />
 </template>

frontend/src/components/Modals/AssignmentModal.vue

@@ -85,8 +85,8 @@ const props = defineProps({
     default: null,
   },
   docs: {
-    type: Array,
+    type: Set,
-    default: () => [],
+    default: new Set(),
   },
   doctype: {
     type: String,

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(() => {

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

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'),

frontend/src/pages/Deal.vue

@@ -278,11 +278,11 @@
     }"
   />
   <AssignmentModal
-    v-if="deal.data"
+    v-if="showAssignmentModal"
-    :doc="deal.data"
-    doctype="CRM Deal"
     v-model="showAssignmentModal"
     v-model:assignees="deal.data._assignedTo"
+    :doc="deal.data"
+    doctype="CRM Deal"
   />
 </template>
 <script setup>

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"

frontend/src/pages/Lead.vue

@@ -185,11 +185,11 @@
     </Resizer>
   </div>
   <AssignmentModal
-    v-if="lead.data"
+    v-if="showAssignmentModal"
-    :doc="lead.data"
-    doctype="CRM Lead"
     v-model="showAssignmentModal"
     v-model:assignees="lead.data._assignedTo"
+    :doc="lead.data"
+    doctype="CRM Lead"
   />
   <Dialog
     v-model="showConvertToDealModal"

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"

frontend/src/pages/MobileDeal.vue

@@ -237,11 +237,11 @@
     }"
   />
   <AssignmentModal
-    v-if="deal.data"
+    v-if="showAssignmentModal"
-    :doc="deal.data"
-    doctype="CRM Deal"
     v-model="showAssignmentModal"
     v-model:assignees="deal.data._assignedTo"
+    :doc="deal.data"
+    doctype="CRM Deal"
   />
 </template>
 <script setup>

frontend/src/pages/MobileLead.vue

@@ -96,11 +96,11 @@
     </Tabs>
   </div>
   <AssignmentModal
-    v-if="lead.data"
+    v-if="showAssignmentModal"
-    :doc="lead.data"
-    doctype="CRM Lead"
     v-model="showAssignmentModal"
     v-model:assignees="lead.data._assignedTo"
+    :doc="lead.data"
+    doctype="CRM Lead"
   />
   <Dialog
     v-model="showConvertToDealModal"