From f835acae57bbb0ed007ae9b0fa2063f478c3e537 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 21 May 2025 14:49:59 +0530
Subject: [PATCH 01/51] feat: added crm agent doctype

(cherry picked from commit fac5ed5579c45868e442bd68dca8007f0553d617)
---
 crm/fcrm/doctype/crm_agent/__init__.py       |  0
 crm/fcrm/doctype/crm_agent/crm_agent.js      |  8 ++
 crm/fcrm/doctype/crm_agent/crm_agent.json    | 98 ++++++++++++++++++++
 crm/fcrm/doctype/crm_agent/crm_agent.py      |  9 ++
 crm/fcrm/doctype/crm_agent/test_crm_agent.py | 29 ++++++
 5 files changed, 144 insertions(+)
 create mode 100644 crm/fcrm/doctype/crm_agent/__init__.py
 create mode 100644 crm/fcrm/doctype/crm_agent/crm_agent.js
 create mode 100644 crm/fcrm/doctype/crm_agent/crm_agent.json
 create mode 100644 crm/fcrm/doctype/crm_agent/crm_agent.py
 create mode 100644 crm/fcrm/doctype/crm_agent/test_crm_agent.py

diff --git a/crm/fcrm/doctype/crm_agent/__init__.py b/crm/fcrm/doctype/crm_agent/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.js b/crm/fcrm/doctype/crm_agent/crm_agent.js
new file mode 100644
index 00000000..042c06ea
--- /dev/null
+++ b/crm/fcrm/doctype/crm_agent/crm_agent.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("CRM Agent", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.json b/crm/fcrm/doctype/crm_agent/crm_agent.json
new file mode 100644
index 00000000..e3ee9758
--- /dev/null
+++ b/crm/fcrm/doctype/crm_agent/crm_agent.json
@@ -0,0 +1,98 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:user",
+ "creation": "2025-05-21 12:59:26.007215",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "user",
+  "is_active",
+  "section_break_qdxc",
+  "first_name",
+  "middle_name",
+  "last_name",
+  "column_break_kpoq",
+  "agent_name",
+  "image"
+ ],
+ "fields": [
+  {
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "label": "User",
+   "options": "User",
+   "unique": 1
+  },
+  {
+   "default": "1",
+   "fieldname": "is_active",
+   "fieldtype": "Check",
+   "label": "Is Active"
+  },
+  {
+   "fieldname": "section_break_qdxc",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "agent_name",
+   "fieldtype": "Data",
+   "label": "Full Name"
+  },
+  {
+   "fieldname": "column_break_kpoq",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "image",
+   "fieldtype": "Attach Image",
+   "label": "Image"
+  },
+  {
+   "fieldname": "first_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "First Name",
+   "reqd": 1
+  },
+  {
+   "fieldname": "middle_name",
+   "fieldtype": "Data",
+   "label": "Middle Name"
+  },
+  {
+   "fieldname": "last_name",
+   "fieldtype": "Data",
+   "label": "Last Name"
+  }
+ ],
+ "grid_page_length": 50,
+ "image_field": "image",
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2025-05-21 13:25:01.497196",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Agent",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "agent_name"
+}
diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.py b/crm/fcrm/doctype/crm_agent/crm_agent.py
new file mode 100644
index 00000000..3b7709c8
--- /dev/null
+++ b/crm/fcrm/doctype/crm_agent/crm_agent.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class CRMAgent(Document):
+	pass
diff --git a/crm/fcrm/doctype/crm_agent/test_crm_agent.py b/crm/fcrm/doctype/crm_agent/test_crm_agent.py
new file mode 100644
index 00000000..ebc29c58
--- /dev/null
+++ b/crm/fcrm/doctype/crm_agent/test_crm_agent.py
@@ -0,0 +1,29 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record dependencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+
+
+class UnitTestCRMAgent(UnitTestCase):
+	"""
+	Unit tests for CRMAgent.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class IntegrationTestCRMAgent(IntegrationTestCase):
+	"""
+	Integration tests for CRMAgent.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass

From 5deef03fd7bb64ae818728342eb769dfdc6208bc Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 21 May 2025 14:52:43 +0530
Subject: [PATCH 02/51] fix: added Agents page in settings

(cherry picked from commit bea1505c63603309fd1eb2d0b59f804ea6b6b65c)
---
 frontend/components.d.ts                      |   1 +
 frontend/src/components/Settings/Agents.vue   | 107 ++++++++++++++++++
 frontend/src/components/Settings/Settings.vue |   6 +
 3 files changed, 114 insertions(+)
 create mode 100644 frontend/src/components/Settings/Agents.vue

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index d7d6057c..06a2d01f 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -14,6 +14,7 @@ declare module 'vue' {
     ActivityIcon: typeof import('./src/components/Icons/ActivityIcon.vue')['default']
     AddressIcon: typeof import('./src/components/Icons/AddressIcon.vue')['default']
     AddressModal: typeof import('./src/components/Modals/AddressModal.vue')['default']
+    Agents: typeof import('./src/components/Settings/Agents.vue')['default']
     AllModals: typeof import('./src/components/Activities/AllModals.vue')['default']
     AppHeader: typeof import('./src/components/Layouts/AppHeader.vue')['default']
     Apps: typeof import('./src/components/Apps.vue')['default']
diff --git a/frontend/src/components/Settings/Agents.vue b/frontend/src/components/Settings/Agents.vue
new file mode 100644
index 00000000..443cde8c
--- /dev/null
+++ b/frontend/src/components/Settings/Agents.vue
@@ -0,0 +1,107 @@
+<template>
+  <div class="flex h-full flex-col gap-8 p-8 text-ink-gray-9">
+    <!-- Header -->
+    <div class="flex items-center justify-between">
+      <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
+        {{ __('Agents') }}
+      </h2>
+      <div class="flex item-center space-x-2">
+        <FormControl
+          v-model="search"
+          :placeholder="'Search'"
+          type="text"
+          :debounce="300"
+        >
+          <template #prefix>
+            <LucideSearch class="h-4 w-4 text-ink-gray-4" />
+          </template>
+        </FormControl>
+      </div>
+    </div>
+
+    <!-- loading state -->
+    <div v-if="agents.loading" class="flex mt-28 justify-between w-full h-full">
+      <Button
+        :loading="agents.loading"
+        variant="ghost"
+        class="w-full"
+        size="2xl"
+      />
+    </div>
+    <!-- Empty State -->
+    <div
+      v-if="!agents.loading && !agents.data?.length"
+      class="flex mt-28 justify-between w-full h-full"
+    >
+      <p class="text-sm text-gray-500 w-full flex justify-center">
+        {{ __('No agents found') }}
+      </p>
+    </div>
+    <!-- Agents List -->
+    <ul
+      v-if="!agents.loading && Boolean(agents.data?.length)"
+      class="divide-y overflow-auto"
+    >
+      <li
+        class="flex items-center justify-between p-2"
+        v-for="agent in agents.data"
+        :key="agent.name"
+      >
+        <div class="flex items-center">
+          <Avatar :image="agent.image" :label="agent.agent_name" size="xl" />
+          <div class="ml-3">
+            <div class="text-base text-ink-gray-9">
+              {{ agent.agent_name }}
+            </div>
+            <div class="mt-1 text-base text-ink-gray-7">
+              {{ agent.name }}
+            </div>
+          </div>
+        </div>
+      </li>
+      <!-- Load More Button -->
+      <div class="flex justify-center">
+        <Button
+          v-if="!agents.loading && agents.hasNextPage"
+          class="mt-3.5 p-2"
+          @click="() => agents.next()"
+          :loading="agents.loading"
+          :label="__('Load More')"
+          icon-left="refresh-cw"
+        />
+      </div>
+    </ul>
+  </div>
+</template>
+
+<script setup>
+import { Avatar, createListResource, FormControl } from 'frappe-ui'
+import { ref, watch } from 'vue'
+
+const agents = createListResource({
+  doctype: 'CRM Agent',
+  cache: 'CRM Agents',
+  fields: ['name', 'image', 'agent_name'],
+  filters: { is_active: ['=', 1] },
+  auto: true,
+  start: 0,
+  pageLength: 20,
+  orderBy: 'creation desc',
+})
+
+const search = ref('')
+watch(search, (newValue) => {
+  agents.filters = {
+    is_active: ['=', 1],
+    agent_name: ['like', `%${newValue}%`],
+  }
+  if (!newValue) {
+    agents.filters = {
+      is_active: ['=', 1],
+    }
+    agents.start = 0
+    agents.pageLength = 10
+  }
+  agents.reload()
+})
+</script>
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 82b1b86c..35029db3 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -54,6 +54,7 @@ import ERPNextIcon from '@/components/Icons/ERPNextIcon.vue'
 import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import InviteIcon from '@/components/Icons/InviteIcon.vue'
 import Email2Icon from '@/components/Icons/Email2Icon.vue'
+import Agents from '@/components/Settings/Agents.vue'
 import GeneralSettings from '@/components/Settings/GeneralSettings.vue'
 import InviteMemberPage from '@/components/Settings/InviteMemberPage.vue'
 import ProfileSettings from '@/components/Settings/ProfileSettings.vue'
@@ -91,6 +92,11 @@ const tabs = computed(() => {
             }),
           component: markRaw(ProfileSettings),
         },
+        {
+          label: __('Agents'),
+          icon: 'user',
+          component: markRaw(Agents),
+        },
         {
           label: __('General'),
           icon: 'settings',

From 909670d23453af9c9fb901fb7b0353a7cef99b3f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 21 May 2025 14:53:20 +0530
Subject: [PATCH 03/51] fix: removed x button from settings modal

(cherry picked from commit 123f183f68edd93fdae02ca35c2ca40f540a764a)
---
 frontend/src/components/Settings/EmailAccountList.vue |  1 -
 frontend/src/components/Settings/Settings.vue         | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/frontend/src/components/Settings/EmailAccountList.vue b/frontend/src/components/Settings/EmailAccountList.vue
index cd6a19ac..fe5fe222 100644
--- a/frontend/src/components/Settings/EmailAccountList.vue
+++ b/frontend/src/components/Settings/EmailAccountList.vue
@@ -10,7 +10,6 @@
         theme="gray"
         variant="solid"
         @click="emit('update:step', 'email-add')"
-        class="mr-8"
       >
         <template #prefix>
           <LucidePlus class="w-4 h-4" />
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 35029db3..0de93ad3 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -33,15 +33,7 @@
             </nav>
           </div>
         </div>
-        <div
-          class="relative flex flex-col flex-1 overflow-y-auto bg-surface-modal"
-        >
-          <Button
-            class="absolute right-5 top-5"
-            variant="ghost"
-            icon="x"
-            @click="showSettings = false"
-          />
+        <div class="flex flex-col flex-1 overflow-y-auto bg-surface-modal">
           <component :is="activeTab.component" v-if="activeTab" />
         </div>
       </div>

From b0341aebdeca9fd60b6ea0237dded27138001a52 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 21 May 2025 14:54:26 +0530
Subject: [PATCH 04/51] fix: added get user role in users store

(cherry picked from commit bf166bdaad6c775be2dd83c7097265ee3c29b3ef)
---
 crm/api/session.py           | 14 ++++++++++++++
 frontend/src/stores/users.js |  9 +++++++++
 2 files changed, 23 insertions(+)

diff --git a/crm/api/session.py b/crm/api/session.py
index 3c12947c..54feea60 100644
--- a/crm/api/session.py
+++ b/crm/api/session.py
@@ -25,6 +25,20 @@ def get_users():
 
 		user.is_manager = "Sales Manager" in frappe.get_roles(user.name) or user.name == "Administrator"
 
+		user.roles = frappe.get_roles(user.name)
+
+		user.role = ""
+
+		if "Sales Manager" in user.roles:
+			user.role = "Sales Manager"
+		elif "Sales User" in user.roles:
+			user.role = "Sales User"
+		elif "Guest" in user.roles:
+			user.role = "Guest"
+
+		if frappe.session.user == user.name:
+			user.session_user = True
+
 		user.is_agent = frappe.db.exists("CRM Telephony Agent", {"user": user.name})
 
 	return users
diff --git a/frontend/src/stores/users.js b/frontend/src/stores/users.js
index 5965c537..b1e2f41a 100644
--- a/frontend/src/stores/users.js
+++ b/frontend/src/stores/users.js
@@ -57,10 +57,19 @@ export const usersStore = defineStore('crm-users', () => {
     return getUser(email).is_agent
   }
 
+  function getUserRole(email) {
+    const user = getUser(email)
+    if (user && user.role) {
+      return user.role
+    }
+    return null
+  }
+
   return {
     users,
     getUser,
     isManager,
     isAgent,
+    getUserRole,
   }
 })

From f7344cde432bf91750489f850ae6adcac09d421f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 21 May 2025 14:55:09 +0530
Subject: [PATCH 05/51] fix: show and allow changing role from agents settings
 page

(cherry picked from commit 346849631eb2ac886b6bf796d355f3891217ff9f)
---
 crm/fcrm/doctype/crm_agent/crm_agent.py     | 20 +++++-
 frontend/src/components/Settings/Agents.vue | 79 ++++++++++++++++++++-
 2 files changed, 96 insertions(+), 3 deletions(-)

diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.py b/crm/fcrm/doctype/crm_agent/crm_agent.py
index 3b7709c8..0d65bd32 100644
--- a/crm/fcrm/doctype/crm_agent/crm_agent.py
+++ b/crm/fcrm/doctype/crm_agent/crm_agent.py
@@ -1,9 +1,27 @@
 # Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-# import frappe
+import frappe
 from frappe.model.document import Document
 
 
 class CRMAgent(Document):
 	pass
+
+
+@frappe.whitelist()
+def update_agent_role(user, new_role):
+	"""
+	Update the role of the user to Agent
+	"""
+
+	user_doc = frappe.get_doc("User", user)
+
+	if new_role == "Sales Manager":
+		user_doc.append_roles("Sales Manager", "System Manager")
+	if new_role == "Sales User":
+		user_doc.append_roles("Sales User")
+		if "Sales Manager" in frappe.get_roles(user_doc.name):
+			user_doc.remove_roles("Sales Manager", "System Manager")
+
+	user_doc.save()
diff --git a/frontend/src/components/Settings/Agents.vue b/frontend/src/components/Settings/Agents.vue
index 443cde8c..10020803 100644
--- a/frontend/src/components/Settings/Agents.vue
+++ b/frontend/src/components/Settings/Agents.vue
@@ -58,6 +58,15 @@
             </div>
           </div>
         </div>
+        <Dropdown
+          :options="getDropdownOptions(agent)"
+          :button="{
+            label: __(getUserRole(agent.name)),
+            iconRight: 'chevron-down',
+            variant: 'ghost',
+          }"
+          placement="right"
+        />
       </li>
       <!-- Load More Button -->
       <div class="flex justify-center">
@@ -75,8 +84,12 @@
 </template>
 
 <script setup>
-import { Avatar, createListResource, FormControl } from 'frappe-ui'
-import { ref, watch } from 'vue'
+import LucideCheck from '~icons/lucide/check'
+import { usersStore } from '@/stores/users'
+import { Avatar, createListResource, FormControl, toast, call } from 'frappe-ui'
+import { ref, h, watch } from 'vue'
+
+const { users, getUserRole } = usersStore()
 
 const agents = createListResource({
   doctype: 'CRM Agent',
@@ -89,6 +102,68 @@ const agents = createListResource({
   orderBy: 'creation desc',
 })
 
+function getDropdownOptions(user) {
+  const agentRole = getUserRole(user.name)
+  return [
+    {
+      label: 'Sales Manager',
+      component: (props) =>
+        RoleOption({
+          role: 'Sales Manager',
+          active: props.active,
+          selected: agentRole === 'Sales Manager',
+          onClick: () => updateRole(user.name, 'Sales Manager'),
+        }),
+    },
+    {
+      label: 'Sales Agent',
+      component: (props) =>
+        RoleOption({
+          role: 'Sales Agent',
+          active: props.active,
+          selected: agentRole === 'Sales User',
+          onClick: () => updateRole(user.name, 'Sales User'),
+        }),
+    },
+  ]
+}
+
+function RoleOption({ active, role, onClick, selected }) {
+  return h(
+    'button',
+    {
+      class: [
+        active ? 'bg-surface-gray-2' : 'text-ink-gray-9',
+        'group flex w-full justify-between items-center rounded-md px-2 py-2 text-sm',
+      ],
+      onClick: !selected ? onClick : null,
+    },
+    [
+      h('span', { class: 'whitespace-nowrap' }, role),
+      selected
+        ? h(LucideCheck, {
+            class: ['h-4 w-4 shrink-0 text-ink-gray-7'],
+            'aria-hidden': true,
+          })
+        : null,
+    ],
+  )
+}
+
+function updateRole(agent, newRole) {
+  const currentRole = getUserRole(agent)
+  if (currentRole === newRole) return
+
+  call('crm.fcrm.doctype.crm_agent.crm_agent.update_agent_role', {
+    user: agent,
+    new_role: newRole,
+  }).then(() => {
+    toast.success(__('{0} role updated to {1}', [agent, newRole]))
+    users.reload()
+    agents.reload()
+  })
+}
+
 const search = ref('')
 watch(search, (newValue) => {
   agents.filters = {

From dd4f5c6f80e7561ce530ba488d3bd199a73ccaef Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 21 May 2025 15:40:37 +0530
Subject: [PATCH 06/51] fix: renamed invite members to invite agent

(cherry picked from commit 5c7f835e4c2d6400302c3466ab0b8c9d655bf274)
---
 frontend/components.d.ts                      |  2 +-
 .../src/components/Layouts/AppSidebar.vue     |  4 +--
 frontend/src/components/Settings/Agents.vue   | 31 ++++++++++++-------
 ...viteMemberPage.vue => InviteAgentPage.vue} |  2 +-
 frontend/src/components/Settings/Settings.vue |  6 ++--
 5 files changed, 26 insertions(+), 19 deletions(-)
 rename frontend/src/components/Settings/{InviteMemberPage.vue => InviteAgentPage.vue} (98%)

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 06a2d01f..7faf480d 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -136,8 +136,8 @@ declare module 'vue' {
     InboundCallIcon: typeof import('./src/components/Icons/InboundCallIcon.vue')['default']
     InboxIcon: typeof import('./src/components/Icons/InboxIcon.vue')['default']
     IndicatorIcon: typeof import('./src/components/Icons/IndicatorIcon.vue')['default']
+    InviteAgentPage: typeof import('./src/components/Settings/InviteAgentPage.vue')['default']
     InviteIcon: typeof import('./src/components/Icons/InviteIcon.vue')['default']
-    InviteMemberPage: typeof import('./src/components/Settings/InviteMemberPage.vue')['default']
     KanbanIcon: typeof import('./src/components/Icons/KanbanIcon.vue')['default']
     KanbanSettings: typeof import('./src/components/Kanban/KanbanSettings.vue')['default']
     KanbanView: typeof import('./src/components/Kanban/KanbanView.vue')['default']
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index f7e87c4f..68e87c82 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -351,7 +351,7 @@ const steps = reactive([
     onClick: () => {
       minimize.value = true
       showSettings.value = true
-      activeSettingsPage.value = 'Invite Members'
+      activeSettingsPage.value = 'Invite Agent'
     },
     condition: () => isManager(),
   },
@@ -529,7 +529,7 @@ const articles = ref([
       { name: 'profile', title: __('Profile') },
       { name: 'custom-branding', title: __('Custom branding') },
       { name: 'home-actions', title: __('Home actions') },
-      { name: 'invite-members', title: __('Invite members') },
+      { name: 'invite-agent', title: __('Invite agent') },
     ],
   },
   {
diff --git a/frontend/src/components/Settings/Agents.vue b/frontend/src/components/Settings/Agents.vue
index 10020803..f4144a1c 100644
--- a/frontend/src/components/Settings/Agents.vue
+++ b/frontend/src/components/Settings/Agents.vue
@@ -61,7 +61,7 @@
         <Dropdown
           :options="getDropdownOptions(agent)"
           :button="{
-            label: __(getUserRole(agent.name)),
+            label: roleMap[getUserRole(agent.name)],
             iconRight: 'chevron-down',
             variant: 'ghost',
           }"
@@ -102,27 +102,32 @@ const agents = createListResource({
   orderBy: 'creation desc',
 })
 
-function getDropdownOptions(user) {
-  const agentRole = getUserRole(user.name)
+const roleMap = {
+  'Sales Manager': __('Manager Access'),
+  'Sales User': __('Regular Access'),
+}
+
+function getDropdownOptions(agent) {
+  const agentRole = getUserRole(agent.name)
   return [
     {
-      label: 'Sales Manager',
+      label: __('Manager Access'),
       component: (props) =>
         RoleOption({
-          role: 'Sales Manager',
+          role: __('Manager Access'),
           active: props.active,
           selected: agentRole === 'Sales Manager',
-          onClick: () => updateRole(user.name, 'Sales Manager'),
+          onClick: () => updateRole(agent, 'Sales Manager'),
         }),
     },
     {
-      label: 'Sales Agent',
+      label: __('Regular Access'),
       component: (props) =>
         RoleOption({
-          role: 'Sales Agent',
+          role: __('Regular Access'),
           active: props.active,
           selected: agentRole === 'Sales User',
-          onClick: () => updateRole(user.name, 'Sales User'),
+          onClick: () => updateRole(agent, 'Sales User'),
         }),
     },
   ]
@@ -151,14 +156,16 @@ function RoleOption({ active, role, onClick, selected }) {
 }
 
 function updateRole(agent, newRole) {
-  const currentRole = getUserRole(agent)
+  const currentRole = getUserRole(agent.name)
   if (currentRole === newRole) return
 
   call('crm.fcrm.doctype.crm_agent.crm_agent.update_agent_role', {
-    user: agent,
+    user: agent.name,
     new_role: newRole,
   }).then(() => {
-    toast.success(__('{0} role updated to {1}', [agent, newRole]))
+    toast.success(
+      __('{0} has been granted {1}', [agent.agent_name, roleMap[newRole]]),
+    )
     users.reload()
     agents.reload()
   })
diff --git a/frontend/src/components/Settings/InviteMemberPage.vue b/frontend/src/components/Settings/InviteAgentPage.vue
similarity index 98%
rename from frontend/src/components/Settings/InviteMemberPage.vue
rename to frontend/src/components/Settings/InviteAgentPage.vue
index 3f0cac8d..1b2f193b 100644
--- a/frontend/src/components/Settings/InviteMemberPage.vue
+++ b/frontend/src/components/Settings/InviteAgentPage.vue
@@ -109,7 +109,7 @@ const error = ref(null)
 const description = computed(() => {
   return {
     'Sales Manager':
-      'Can manage and invite new members, and create public & private views (reports).',
+      'Can manage and invite new agents, and create public & private views (reports).',
     'Sales User':
       'Can work with leads and deals and create private views (reports).',
   }[role.value]
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 0de93ad3..3fbc1a61 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -48,7 +48,7 @@ import InviteIcon from '@/components/Icons/InviteIcon.vue'
 import Email2Icon from '@/components/Icons/Email2Icon.vue'
 import Agents from '@/components/Settings/Agents.vue'
 import GeneralSettings from '@/components/Settings/GeneralSettings.vue'
-import InviteMemberPage from '@/components/Settings/InviteMemberPage.vue'
+import InviteAgentPage from '@/components/Settings/InviteAgentPage.vue'
 import ProfileSettings from '@/components/Settings/ProfileSettings.vue'
 import WhatsAppSettings from '@/components/Settings/WhatsAppSettings.vue'
 import ERPNextSettings from '@/components/Settings/ERPNextSettings.vue'
@@ -96,9 +96,9 @@ const tabs = computed(() => {
           condition: () => isManager(),
         },
         {
-          label: __('Invite Members'),
+          label: __('Invite Agent'),
           icon: InviteIcon,
-          component: markRaw(InviteMemberPage),
+          component: markRaw(InviteAgentPage),
           condition: () => isManager(),
         },
         {

From a86884e40e02d2085fd52480ec42ce98d949403c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 21 May 2025 16:27:52 +0530
Subject: [PATCH 07/51] fix: activate/deactivate agent

(cherry picked from commit 0a836c78bb45a5e0eaa27142ea07fc7b063b5b09)
---
 crm/fcrm/doctype/crm_agent/crm_agent.py     | 19 +++++
 frontend/src/components/Settings/Agents.vue | 92 +++++++++++++++++----
 2 files changed, 95 insertions(+), 16 deletions(-)

diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.py b/crm/fcrm/doctype/crm_agent/crm_agent.py
index 0d65bd32..5cde4225 100644
--- a/crm/fcrm/doctype/crm_agent/crm_agent.py
+++ b/crm/fcrm/doctype/crm_agent/crm_agent.py
@@ -13,8 +13,15 @@ class CRMAgent(Document):
 def update_agent_role(user, new_role):
 	"""
 	Update the role of the user to Agent
+	:param user: The name of the user
+	:param new_role: The new role to assign (Sales Manager or Sales User)
 	"""
 
+	frappe.only_for("Sales Manager")
+
+	if new_role not in ["Sales Manager", "Sales User"]:
+		frappe.throw("Cannot assign this role")
+
 	user_doc = frappe.get_doc("User", user)
 
 	if new_role == "Sales Manager":
@@ -25,3 +32,15 @@ def update_agent_role(user, new_role):
 			user_doc.remove_roles("Sales Manager", "System Manager")
 
 	user_doc.save()
+
+
+@frappe.whitelist()
+def update_agent_status(agent, status):
+	"""
+	Activate or deactivate the agent
+	:param agent: The name of the agent
+	:param status: The status to set (1 for active, 0 for inactive)
+	"""
+	frappe.only_for("Sales Manager")
+
+	frappe.db.set_value("CRM Agent", agent, "is_active", status)
diff --git a/frontend/src/components/Settings/Agents.vue b/frontend/src/components/Settings/Agents.vue
index f4144a1c..e477c610 100644
--- a/frontend/src/components/Settings/Agents.vue
+++ b/frontend/src/components/Settings/Agents.vue
@@ -5,7 +5,7 @@
       <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
         {{ __('Agents') }}
       </h2>
-      <div class="flex item-center space-x-2">
+      <div class="flex item-center space-x-2 mr-2">
         <FormControl
           v-model="search"
           :placeholder="'Search'"
@@ -49,24 +49,41 @@
       >
         <div class="flex items-center">
           <Avatar :image="agent.image" :label="agent.agent_name" size="xl" />
-          <div class="ml-3">
-            <div class="text-base text-ink-gray-9">
+          <div class="flex flex-col gap-1 ml-3">
+            <div class="flex items-center gap-2 text-base text-ink-gray-9 h-4">
               {{ agent.agent_name }}
+              <Badge
+                v-if="!agent.is_active"
+                variant="subtle"
+                theme="gray"
+                size="sm"
+                label="Inactive"
+              />
             </div>
-            <div class="mt-1 text-base text-ink-gray-7">
+            <div class="text-base text-ink-gray-5">
               {{ agent.name }}
             </div>
           </div>
         </div>
-        <Dropdown
-          :options="getDropdownOptions(agent)"
-          :button="{
-            label: roleMap[getUserRole(agent.name)],
-            iconRight: 'chevron-down',
-            variant: 'ghost',
-          }"
-          placement="right"
-        />
+        <div class="flex gap-1 items-center flex-row-reverse">
+          <Dropdown
+            :options="getMoreOptions(agent)"
+            :button="{
+              icon: 'more-horizontal',
+              variant: 'ghost',
+            }"
+            placement="right"
+          />
+          <Dropdown
+            :options="getDropdownOptions(agent)"
+            :button="{
+              label: roleMap[getUserRole(agent.name)],
+              iconRight: 'chevron-down',
+              variant: 'ghost',
+            }"
+            placement="right"
+          />
+        </div>
       </li>
       <!-- Load More Button -->
       <div class="flex justify-center">
@@ -86,7 +103,14 @@
 <script setup>
 import LucideCheck from '~icons/lucide/check'
 import { usersStore } from '@/stores/users'
-import { Avatar, createListResource, FormControl, toast, call } from 'frappe-ui'
+import {
+  Avatar,
+  Badge,
+  createListResource,
+  FormControl,
+  toast,
+  call,
+} from 'frappe-ui'
 import { ref, h, watch } from 'vue'
 
 const { users, getUserRole } = usersStore()
@@ -94,8 +118,7 @@ const { users, getUserRole } = usersStore()
 const agents = createListResource({
   doctype: 'CRM Agent',
   cache: 'CRM Agents',
-  fields: ['name', 'image', 'agent_name'],
-  filters: { is_active: ['=', 1] },
+  fields: ['name', 'image', 'is_active', 'agent_name'],
   auto: true,
   start: 0,
   pageLength: 20,
@@ -107,6 +130,25 @@ const roleMap = {
   'Sales User': __('Regular Access'),
 }
 
+function getMoreOptions(agent) {
+  let options = [
+    {
+      label: __('Activate'),
+      icon: 'check-circle',
+      onClick: () => updateStatus(agent, true),
+      condition: () => !agent.is_active,
+    },
+    {
+      label: __('Deactivate'),
+      icon: 'x-circle',
+      onClick: () => updateStatus(agent, false),
+      condition: () => agent.is_active,
+    },
+  ]
+
+  return options.filter((option) => option.condition())
+}
+
 function getDropdownOptions(agent) {
   const agentRole = getUserRole(agent.name)
   return [
@@ -171,6 +213,24 @@ function updateRole(agent, newRole) {
   })
 }
 
+function updateStatus(agent, status) {
+  const currentStatus = agent.is_active
+  if (currentStatus === status) return
+
+  call('crm.fcrm.doctype.crm_agent.crm_agent.update_agent_status', {
+    agent: agent.name,
+    status,
+  }).then(() => {
+    toast.success(
+      __('{0} has been {1}', [
+        agent.agent_name,
+        status ? 'activated' : 'deactivated',
+      ]),
+    )
+    agents.reload()
+  })
+}
+
 const search = ref('')
 watch(search, (newValue) => {
   agents.filters = {

From 37e86b461003f5b28f438011f5cdfa1b7c0c1fb0 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 21 May 2025 16:39:04 +0530
Subject: [PATCH 08/51] fix: update agent fields based on user

(cherry picked from commit e9812495e940131504f9cbbb4a7a4892a4a234c3)
---
 crm/fcrm/doctype/crm_agent/crm_agent.json |  4 +++-
 crm/fcrm/doctype/crm_agent/crm_agent.py   | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.json b/crm/fcrm/doctype/crm_agent/crm_agent.json
index e3ee9758..c765290d 100644
--- a/crm/fcrm/doctype/crm_agent/crm_agent.json
+++ b/crm/fcrm/doctype/crm_agent/crm_agent.json
@@ -49,6 +49,8 @@
    "label": "Image"
   },
   {
+   "fetch_from": "user.first_name",
+   "fetch_if_empty": 1,
    "fieldname": "first_name",
    "fieldtype": "Data",
    "in_list_view": 1,
@@ -70,7 +72,7 @@
  "image_field": "image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-05-21 13:25:01.497196",
+ "modified": "2025-05-21 16:35:07.667954",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Agent",
diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.py b/crm/fcrm/doctype/crm_agent/crm_agent.py
index 5cde4225..34c524b6 100644
--- a/crm/fcrm/doctype/crm_agent/crm_agent.py
+++ b/crm/fcrm/doctype/crm_agent/crm_agent.py
@@ -6,7 +6,19 @@ from frappe.model.document import Document
 
 
 class CRMAgent(Document):
-	pass
+	def validate(self):
+		if self.user:
+			user = frappe.get_doc("User", self.user)
+			if not self.first_name:
+				self.first_name = user.first_name
+			if not self.middle_name:
+				self.middle_name = user.middle_name
+			if not self.last_name:
+				self.last_name = user.last_name
+			if not self.agent_name:
+				self.agent_name = user.full_name
+			if not self.image:
+				self.image = user.user_image
 
 
 @frappe.whitelist()

From 58c500df1fb22e1c74ad1624112f90f46a6cbadb Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 12:03:47 +0530
Subject: [PATCH 09/51] fix: renamed Agent to User in Settings

(cherry picked from commit 463d60b650e6f3071c421998df43fa801ca60c41)
---
 frontend/src/components/Controls/MultiSelectEmailInput.vue | 2 +-
 frontend/src/components/Settings/Agents.vue                | 2 +-
 frontend/src/components/Settings/Settings.vue              | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Controls/MultiSelectEmailInput.vue b/frontend/src/components/Controls/MultiSelectEmailInput.vue
index 182ed938..5e3b6cf0 100644
--- a/frontend/src/components/Controls/MultiSelectEmailInput.vue
+++ b/frontend/src/components/Controls/MultiSelectEmailInput.vue
@@ -70,7 +70,7 @@
                       {{
                         fetchContacts
                           ? __('No results found')
-                          : __('Type an email address to add')
+                          : __('Type an email address to invite')
                       }}
                     </div>
                     <ComboboxOption
diff --git a/frontend/src/components/Settings/Agents.vue b/frontend/src/components/Settings/Agents.vue
index e477c610..0b7824ef 100644
--- a/frontend/src/components/Settings/Agents.vue
+++ b/frontend/src/components/Settings/Agents.vue
@@ -3,7 +3,7 @@
     <!-- Header -->
     <div class="flex items-center justify-between">
       <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
-        {{ __('Agents') }}
+        {{ __('Users') }}
       </h2>
       <div class="flex item-center space-x-2 mr-2">
         <FormControl
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 3fbc1a61..5ced2f05 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -85,7 +85,7 @@ const tabs = computed(() => {
           component: markRaw(ProfileSettings),
         },
         {
-          label: __('Agents'),
+          label: __('Users'),
           icon: 'user',
           component: markRaw(Agents),
         },
@@ -96,7 +96,7 @@ const tabs = computed(() => {
           condition: () => isManager(),
         },
         {
-          label: __('Invite Agent'),
+          label: __('Invite User'),
           icon: InviteIcon,
           component: markRaw(InviteAgentPage),
           condition: () => isManager(),

From c918a7663526436f2c480c91a227c7fc8ca79cb6 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 12:04:44 +0530
Subject: [PATCH 10/51] fix: renamed & added role with filter

(cherry picked from commit 6d3e4406ae52dd4d6a6966fc03a42e300b53469d)
---
 crm/api/session.py                          |  7 +-
 crm/fcrm/doctype/crm_agent/crm_agent.py     | 12 +--
 frappe-ui                                   |  2 +-
 frontend/src/components/Settings/Agents.vue | 83 +++++++++++++++++----
 4 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/crm/api/session.py b/crm/api/session.py
index 54feea60..278f8b5e 100644
--- a/crm/api/session.py
+++ b/crm/api/session.py
@@ -23,13 +23,16 @@ def get_users():
 		if frappe.session.user == user.name:
 			user.session_user = True
 
-		user.is_manager = "Sales Manager" in frappe.get_roles(user.name) or user.name == "Administrator"
+		user.is_manager = "Sales Manager" in frappe.get_roles(user.name)
+		user.is_admin = user.name == "Administrator"
 
 		user.roles = frappe.get_roles(user.name)
 
 		user.role = ""
 
-		if "Sales Manager" in user.roles:
+		if "System Manager" in user.roles:
+			user.role = "System Manager"
+		elif "Sales Manager" in user.roles:
 			user.role = "Sales Manager"
 		elif "Sales User" in user.roles:
 			user.role = "Sales User"
diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.py b/crm/fcrm/doctype/crm_agent/crm_agent.py
index 34c524b6..21ddb800 100644
--- a/crm/fcrm/doctype/crm_agent/crm_agent.py
+++ b/crm/fcrm/doctype/crm_agent/crm_agent.py
@@ -29,19 +29,21 @@ def update_agent_role(user, new_role):
 	:param new_role: The new role to assign (Sales Manager or Sales User)
 	"""
 
-	frappe.only_for("Sales Manager")
+	frappe.only_for(["System Manager", "System Manager"])
 
-	if new_role not in ["Sales Manager", "Sales User"]:
+	if new_role not in ["System Manager", "Sales Manager", "Sales User"]:
 		frappe.throw("Cannot assign this role")
 
 	user_doc = frappe.get_doc("User", user)
 
+	if new_role == "System Manager":
+		user_doc.append_roles("System Manager")
 	if new_role == "Sales Manager":
-		user_doc.append_roles("Sales Manager", "System Manager")
+		user_doc.append_roles("Sales Manager")
+		user_doc.remove_roles("System Manager")
 	if new_role == "Sales User":
 		user_doc.append_roles("Sales User")
-		if "Sales Manager" in frappe.get_roles(user_doc.name):
-			user_doc.remove_roles("Sales Manager", "System Manager")
+		user_doc.remove_roles("Sales Manager", "System Manager")
 
 	user_doc.save()
 
diff --git a/frappe-ui b/frappe-ui
index 8b615c0e..883bb643 160000
--- a/frappe-ui
+++ b/frappe-ui
@@ -1 +1 @@
-Subproject commit 8b615c0e899d75b99c7d36ec6df97b5d0386b2ca
+Subproject commit 883bb643d1e662d6467925927e347dd28376960f
diff --git a/frontend/src/components/Settings/Agents.vue b/frontend/src/components/Settings/Agents.vue
index 0b7824ef..df77688f 100644
--- a/frontend/src/components/Settings/Agents.vue
+++ b/frontend/src/components/Settings/Agents.vue
@@ -5,7 +5,7 @@
       <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
         {{ __('Users') }}
       </h2>
-      <div class="flex item-center space-x-2 mr-2">
+      <div class="flex item-center space-x-2">
         <FormControl
           v-model="search"
           :placeholder="'Search'"
@@ -16,6 +16,23 @@
             <LucideSearch class="h-4 w-4 text-ink-gray-4" />
           </template>
         </FormControl>
+        <FormControl
+          type="select"
+          :value="currentStatus"
+          :options="[
+            { label: __('All'), value: 'All' },
+            { label: __('Active'), value: 'Active' },
+            { label: __('Inactive'), value: 'Inactive' },
+          ]"
+          @change="(e) => changeStatus(e.target.value)"
+        >
+        </FormControl>
+        <Button
+          :label="__('Add User')"
+          icon-left="plus"
+          variant="solid"
+          @click="$emit('add-agent')"
+        />
       </div>
     </div>
 
@@ -43,7 +60,7 @@
       class="divide-y overflow-auto"
     >
       <li
-        class="flex items-center justify-between p-2"
+        class="flex items-center justify-between py-2"
         v-for="agent in agents.data"
         :key="agent.name"
       >
@@ -65,12 +82,11 @@
             </div>
           </div>
         </div>
-        <div class="flex gap-1 items-center flex-row-reverse">
+        <div class="flex gap-2 items-center flex-row-reverse">
           <Dropdown
             :options="getMoreOptions(agent)"
             :button="{
               icon: 'more-horizontal',
-              variant: 'ghost',
             }"
             placement="right"
           />
@@ -79,16 +95,17 @@
             :button="{
               label: roleMap[getUserRole(agent.name)],
               iconRight: 'chevron-down',
-              variant: 'ghost',
             }"
             placement="right"
           />
         </div>
       </li>
       <!-- Load More Button -->
-      <div class="flex justify-center">
+      <div
+        v-if="!agents.loading && agents.hasNextPage"
+        class="flex justify-center"
+      >
         <Button
-          v-if="!agents.loading && agents.hasNextPage"
           class="mt-3.5 p-2"
           @click="() => agents.next()"
           :loading="agents.loading"
@@ -111,7 +128,7 @@ import {
   toast,
   call,
 } from 'frappe-ui'
-import { ref, h, watch } from 'vue'
+import { ref, h, watch, onMounted } from 'vue'
 
 const { users, getUserRole } = usersStore()
 
@@ -119,6 +136,7 @@ const agents = createListResource({
   doctype: 'CRM Agent',
   cache: 'CRM Agents',
   fields: ['name', 'image', 'is_active', 'agent_name'],
+  filters: { is_active: ['=', 1] },
   auto: true,
   start: 0,
   pageLength: 20,
@@ -126,8 +144,9 @@ const agents = createListResource({
 })
 
 const roleMap = {
-  'Sales Manager': __('Manager Access'),
-  'Sales User': __('Regular Access'),
+  'System Manager': __('Admin'),
+  'Sales Manager': __('Manager'),
+  'Sales User': __('Sales User'),
 }
 
 function getMoreOptions(agent) {
@@ -153,20 +172,30 @@ function getDropdownOptions(agent) {
   const agentRole = getUserRole(agent.name)
   return [
     {
-      label: __('Manager Access'),
+      label: __('Admin'),
       component: (props) =>
         RoleOption({
-          role: __('Manager Access'),
+          role: __('Admin'),
+          active: props.active,
+          selected: agentRole === 'System Manager',
+          onClick: () => updateRole(agent, 'System Manager'),
+        }),
+    },
+    {
+      label: __('Manager'),
+      component: (props) =>
+        RoleOption({
+          role: __('Manager'),
           active: props.active,
           selected: agentRole === 'Sales Manager',
           onClick: () => updateRole(agent, 'Sales Manager'),
         }),
     },
     {
-      label: __('Regular Access'),
+      label: __('Sales User'),
       component: (props) =>
         RoleOption({
-          role: __('Regular Access'),
+          role: __('Sales User'),
           active: props.active,
           selected: agentRole === 'Sales User',
           onClick: () => updateRole(agent, 'Sales User'),
@@ -206,7 +235,10 @@ function updateRole(agent, newRole) {
     new_role: newRole,
   }).then(() => {
     toast.success(
-      __('{0} has been granted {1}', [agent.agent_name, roleMap[newRole]]),
+      __('{0} has been granted {1} access', [
+        agent.agent_name,
+        roleMap[newRole],
+      ]),
     )
     users.reload()
     agents.reload()
@@ -231,6 +263,27 @@ function updateStatus(agent, status) {
   })
 }
 
+const currentStatus = ref('Active')
+
+function changeStatus(status) {
+  currentStatus.value = status
+  updateFilters()
+}
+
+function updateFilters() {
+  const status = currentStatus.value || 'Active'
+
+  agents.filters = {}
+  if (status === 'Active') {
+    agents.filters.is_active = ['=', 1]
+  } else if (status === 'Inactive') {
+    agents.filters.is_active = ['=', 0]
+  }
+  agents.reload()
+}
+
+onMounted(() => updateFilters())
+
 const search = ref('')
 watch(search, (newValue) => {
   agents.filters = {

From 4ed8a54a98feb9be3ff84922af17388605d06616 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 12:37:08 +0530
Subject: [PATCH 11/51] fix: renamed component names from Agent to User

(cherry picked from commit b534aae70bc6304c818ef33e05c8a0a50146a4cf)
---
 .../{crm_agent => crm_user}/__init__.py       |   0
 .../crm_agent.js => crm_user/crm_user.js}     |   2 +-
 .../crm_agent.json => crm_user/crm_user.json} |  18 +--
 .../crm_agent.py => crm_user/crm_user.py}     |  18 +--
 .../test_crm_user.py}                         |   8 +-
 frontend/components.d.ts                      |   2 +
 ...InviteAgentPage.vue => InviteUserPage.vue} |   0
 frontend/src/components/Settings/Settings.vue |  16 +--
 .../Settings/{Agents.vue => Users.vue}        | 121 +++++++++---------
 9 files changed, 92 insertions(+), 93 deletions(-)
 rename crm/fcrm/doctype/{crm_agent => crm_user}/__init__.py (100%)
 rename crm/fcrm/doctype/{crm_agent/crm_agent.js => crm_user/crm_user.js} (81%)
 rename crm/fcrm/doctype/{crm_agent/crm_agent.json => crm_user/crm_user.json} (92%)
 rename crm/fcrm/doctype/{crm_agent/crm_agent.py => crm_user/crm_user.py} (78%)
 rename crm/fcrm/doctype/{crm_agent/test_crm_agent.py => crm_user/test_crm_user.py} (80%)
 rename frontend/src/components/Settings/{InviteAgentPage.vue => InviteUserPage.vue} (100%)
 rename frontend/src/components/Settings/{Agents.vue => Users.vue} (67%)

diff --git a/crm/fcrm/doctype/crm_agent/__init__.py b/crm/fcrm/doctype/crm_user/__init__.py
similarity index 100%
rename from crm/fcrm/doctype/crm_agent/__init__.py
rename to crm/fcrm/doctype/crm_user/__init__.py
diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.js b/crm/fcrm/doctype/crm_user/crm_user.js
similarity index 81%
rename from crm/fcrm/doctype/crm_agent/crm_agent.js
rename to crm/fcrm/doctype/crm_user/crm_user.js
index 042c06ea..71b91b59 100644
--- a/crm/fcrm/doctype/crm_agent/crm_agent.js
+++ b/crm/fcrm/doctype/crm_user/crm_user.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-// frappe.ui.form.on("CRM Agent", {
+// frappe.ui.form.on("CRM User", {
 // 	refresh(frm) {
 
 // 	},
diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.json b/crm/fcrm/doctype/crm_user/crm_user.json
similarity index 92%
rename from crm/fcrm/doctype/crm_agent/crm_agent.json
rename to crm/fcrm/doctype/crm_user/crm_user.json
index c765290d..5ba7f5e0 100644
--- a/crm/fcrm/doctype/crm_agent/crm_agent.json
+++ b/crm/fcrm/doctype/crm_user/crm_user.json
@@ -13,7 +13,7 @@
   "middle_name",
   "last_name",
   "column_break_kpoq",
-  "agent_name",
+  "user_name",
   "image"
  ],
  "fields": [
@@ -34,11 +34,6 @@
    "fieldname": "section_break_qdxc",
    "fieldtype": "Section Break"
   },
-  {
-   "fieldname": "agent_name",
-   "fieldtype": "Data",
-   "label": "Full Name"
-  },
   {
    "fieldname": "column_break_kpoq",
    "fieldtype": "Column Break"
@@ -66,16 +61,21 @@
    "fieldname": "last_name",
    "fieldtype": "Data",
    "label": "Last Name"
+  },
+  {
+   "fieldname": "user_name",
+   "fieldtype": "Data",
+   "label": "Full Name"
   }
  ],
  "grid_page_length": 50,
  "image_field": "image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-05-21 16:35:07.667954",
+ "modified": "2025-06-17 12:08:16.616216",
  "modified_by": "Administrator",
  "module": "FCRM",
- "name": "CRM Agent",
+ "name": "CRM User",
  "naming_rule": "By fieldname",
  "owner": "Administrator",
  "permissions": [
@@ -96,5 +96,5 @@
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
- "title_field": "agent_name"
+ "title_field": "user_name"
 }
diff --git a/crm/fcrm/doctype/crm_agent/crm_agent.py b/crm/fcrm/doctype/crm_user/crm_user.py
similarity index 78%
rename from crm/fcrm/doctype/crm_agent/crm_agent.py
rename to crm/fcrm/doctype/crm_user/crm_user.py
index 21ddb800..98c74d51 100644
--- a/crm/fcrm/doctype/crm_agent/crm_agent.py
+++ b/crm/fcrm/doctype/crm_user/crm_user.py
@@ -5,7 +5,7 @@ import frappe
 from frappe.model.document import Document
 
 
-class CRMAgent(Document):
+class CRMUser(Document):
 	def validate(self):
 		if self.user:
 			user = frappe.get_doc("User", self.user)
@@ -15,16 +15,16 @@ class CRMAgent(Document):
 				self.middle_name = user.middle_name
 			if not self.last_name:
 				self.last_name = user.last_name
-			if not self.agent_name:
-				self.agent_name = user.full_name
+			if not self.user_name:
+				self.user_name = user.full_name
 			if not self.image:
 				self.image = user.user_image
 
 
 @frappe.whitelist()
-def update_agent_role(user, new_role):
+def update_user_role(user, new_role):
 	"""
-	Update the role of the user to Agent
+	Update the role of the user to Sales Manager, Sales User, or System Manager.
 	:param user: The name of the user
 	:param new_role: The new role to assign (Sales Manager or Sales User)
 	"""
@@ -49,12 +49,12 @@ def update_agent_role(user, new_role):
 
 
 @frappe.whitelist()
-def update_agent_status(agent, status):
+def update_user_status(user, status):
 	"""
-	Activate or deactivate the agent
-	:param agent: The name of the agent
+	Activate or deactivate the user
+	:param user: The name of the user
 	:param status: The status to set (1 for active, 0 for inactive)
 	"""
 	frappe.only_for("Sales Manager")
 
-	frappe.db.set_value("CRM Agent", agent, "is_active", status)
+	frappe.db.set_value("CRM User", user, "is_active", status)
diff --git a/crm/fcrm/doctype/crm_agent/test_crm_agent.py b/crm/fcrm/doctype/crm_user/test_crm_user.py
similarity index 80%
rename from crm/fcrm/doctype/crm_agent/test_crm_agent.py
rename to crm/fcrm/doctype/crm_user/test_crm_user.py
index ebc29c58..f368fa88 100644
--- a/crm/fcrm/doctype/crm_agent/test_crm_agent.py
+++ b/crm/fcrm/doctype/crm_user/test_crm_user.py
@@ -11,18 +11,18 @@ EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
 IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
 
 
-class UnitTestCRMAgent(UnitTestCase):
+class UnitTestCRMUser(UnitTestCase):
 	"""
-	Unit tests for CRMAgent.
+	Unit tests for CRMUser.
 	Use this class for testing individual functions and methods.
 	"""
 
 	pass
 
 
-class IntegrationTestCRMAgent(IntegrationTestCase):
+class IntegrationTestCRMUser(IntegrationTestCase):
 	"""
-	Integration tests for CRMAgent.
+	Integration tests for CRMUser.
 	Use this class for testing interactions between multiple components.
 	"""
 
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 7faf480d..4c5b3699 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -138,6 +138,7 @@ declare module 'vue' {
     IndicatorIcon: typeof import('./src/components/Icons/IndicatorIcon.vue')['default']
     InviteAgentPage: typeof import('./src/components/Settings/InviteAgentPage.vue')['default']
     InviteIcon: typeof import('./src/components/Icons/InviteIcon.vue')['default']
+    InviteUserPage: typeof import('./src/components/Settings/InviteUserPage.vue')['default']
     KanbanIcon: typeof import('./src/components/Icons/KanbanIcon.vue')['default']
     KanbanSettings: typeof import('./src/components/Kanban/KanbanSettings.vue')['default']
     KanbanView: typeof import('./src/components/Kanban/KanbanView.vue')['default']
@@ -229,6 +230,7 @@ declare module 'vue' {
     UnpinIcon: typeof import('./src/components/Icons/UnpinIcon.vue')['default']
     UserAvatar: typeof import('./src/components/UserAvatar.vue')['default']
     UserDropdown: typeof import('./src/components/UserDropdown.vue')['default']
+    Users: typeof import('./src/components/Settings/Users.vue')['default']
     ViewBreadcrumbs: typeof import('./src/components/ViewBreadcrumbs.vue')['default']
     ViewControls: typeof import('./src/components/ViewControls.vue')['default']
     ViewModal: typeof import('./src/components/Modals/ViewModal.vue')['default']
diff --git a/frontend/src/components/Settings/InviteAgentPage.vue b/frontend/src/components/Settings/InviteUserPage.vue
similarity index 100%
rename from frontend/src/components/Settings/InviteAgentPage.vue
rename to frontend/src/components/Settings/InviteUserPage.vue
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 5ced2f05..c20984e8 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -46,9 +46,9 @@ import ERPNextIcon from '@/components/Icons/ERPNextIcon.vue'
 import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import InviteIcon from '@/components/Icons/InviteIcon.vue'
 import Email2Icon from '@/components/Icons/Email2Icon.vue'
-import Agents from '@/components/Settings/Agents.vue'
+import Users from '@/components/Settings/Users.vue'
 import GeneralSettings from '@/components/Settings/GeneralSettings.vue'
-import InviteAgentPage from '@/components/Settings/InviteAgentPage.vue'
+import InviteUserPage from '@/components/Settings/InviteUserPage.vue'
 import ProfileSettings from '@/components/Settings/ProfileSettings.vue'
 import WhatsAppSettings from '@/components/Settings/WhatsAppSettings.vue'
 import ERPNextSettings from '@/components/Settings/ERPNextSettings.vue'
@@ -84,21 +84,21 @@ const tabs = computed(() => {
             }),
           component: markRaw(ProfileSettings),
         },
-        {
-          label: __('Users'),
-          icon: 'user',
-          component: markRaw(Agents),
-        },
         {
           label: __('General'),
           icon: 'settings',
           component: markRaw(GeneralSettings),
           condition: () => isManager(),
         },
+        {
+          label: __('Users'),
+          icon: 'user',
+          component: markRaw(Users),
+        },
         {
           label: __('Invite User'),
           icon: InviteIcon,
-          component: markRaw(InviteAgentPage),
+          component: markRaw(InviteUserPage),
           condition: () => isManager(),
         },
         {
diff --git a/frontend/src/components/Settings/Agents.vue b/frontend/src/components/Settings/Users.vue
similarity index 67%
rename from frontend/src/components/Settings/Agents.vue
rename to frontend/src/components/Settings/Users.vue
index df77688f..684ee726 100644
--- a/frontend/src/components/Settings/Agents.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -31,15 +31,15 @@
           :label="__('Add User')"
           icon-left="plus"
           variant="solid"
-          @click="$emit('add-agent')"
+          @click="$emit('add-user')"
         />
       </div>
     </div>
 
     <!-- loading state -->
-    <div v-if="agents.loading" class="flex mt-28 justify-between w-full h-full">
+    <div v-if="users.loading" class="flex mt-28 justify-between w-full h-full">
       <Button
-        :loading="agents.loading"
+        :loading="users.loading"
         variant="ghost"
         class="w-full"
         size="2xl"
@@ -47,30 +47,30 @@
     </div>
     <!-- Empty State -->
     <div
-      v-if="!agents.loading && !agents.data?.length"
+      v-if="!users.loading && !users.data?.length"
       class="flex mt-28 justify-between w-full h-full"
     >
       <p class="text-sm text-gray-500 w-full flex justify-center">
-        {{ __('No agents found') }}
+        {{ __('No users found') }}
       </p>
     </div>
-    <!-- Agents List -->
+    <!-- Users List -->
     <ul
-      v-if="!agents.loading && Boolean(agents.data?.length)"
+      v-if="!users.loading && Boolean(users.data?.length)"
       class="divide-y overflow-auto"
     >
       <li
         class="flex items-center justify-between py-2"
-        v-for="agent in agents.data"
-        :key="agent.name"
+        v-for="user in users.data"
+        :key="user.name"
       >
         <div class="flex items-center">
-          <Avatar :image="agent.image" :label="agent.agent_name" size="xl" />
+          <Avatar :image="user.image" :label="user.user_name" size="xl" />
           <div class="flex flex-col gap-1 ml-3">
             <div class="flex items-center gap-2 text-base text-ink-gray-9 h-4">
-              {{ agent.agent_name }}
+              {{ user.user_name }}
               <Badge
-                v-if="!agent.is_active"
+                v-if="!user.is_active"
                 variant="subtle"
                 theme="gray"
                 size="sm"
@@ -78,22 +78,22 @@
               />
             </div>
             <div class="text-base text-ink-gray-5">
-              {{ agent.name }}
+              {{ user.name }}
             </div>
           </div>
         </div>
         <div class="flex gap-2 items-center flex-row-reverse">
           <Dropdown
-            :options="getMoreOptions(agent)"
+            :options="getMoreOptions(user)"
             :button="{
               icon: 'more-horizontal',
             }"
             placement="right"
           />
           <Dropdown
-            :options="getDropdownOptions(agent)"
+            :options="getDropdownOptions(user)"
             :button="{
-              label: roleMap[getUserRole(agent.name)],
+              label: roleMap[getUserRole(user.name)],
               iconRight: 'chevron-down',
             }"
             placement="right"
@@ -102,13 +102,13 @@
       </li>
       <!-- Load More Button -->
       <div
-        v-if="!agents.loading && agents.hasNextPage"
+        v-if="!users.loading && users.hasNextPage"
         class="flex justify-center"
       >
         <Button
           class="mt-3.5 p-2"
-          @click="() => agents.next()"
-          :loading="agents.loading"
+          @click="() => users.next()"
+          :loading="users.loading"
           :label="__('Load More')"
           icon-left="refresh-cw"
         />
@@ -130,12 +130,12 @@ import {
 } from 'frappe-ui'
 import { ref, h, watch, onMounted } from 'vue'
 
-const { users, getUserRole } = usersStore()
+const { users: usersResource, getUserRole } = usersStore()
 
-const agents = createListResource({
-  doctype: 'CRM Agent',
-  cache: 'CRM Agents',
-  fields: ['name', 'image', 'is_active', 'agent_name'],
+const users = createListResource({
+  doctype: 'CRM User',
+  cache: 'CRM Users',
+  fields: ['name', 'image', 'is_active', 'user_name'],
   filters: { is_active: ['=', 1] },
   auto: true,
   start: 0,
@@ -149,27 +149,27 @@ const roleMap = {
   'Sales User': __('Sales User'),
 }
 
-function getMoreOptions(agent) {
+function getMoreOptions(user) {
   let options = [
     {
       label: __('Activate'),
       icon: 'check-circle',
-      onClick: () => updateStatus(agent, true),
-      condition: () => !agent.is_active,
+      onClick: () => updateStatus(user, true),
+      condition: () => !user.is_active,
     },
     {
       label: __('Deactivate'),
       icon: 'x-circle',
-      onClick: () => updateStatus(agent, false),
-      condition: () => agent.is_active,
+      onClick: () => updateStatus(user, false),
+      condition: () => user.is_active,
     },
   ]
 
   return options.filter((option) => option.condition())
 }
 
-function getDropdownOptions(agent) {
-  const agentRole = getUserRole(agent.name)
+function getDropdownOptions(user) {
+  const userRole = getUserRole(user.name)
   return [
     {
       label: __('Admin'),
@@ -177,8 +177,8 @@ function getDropdownOptions(agent) {
         RoleOption({
           role: __('Admin'),
           active: props.active,
-          selected: agentRole === 'System Manager',
-          onClick: () => updateRole(agent, 'System Manager'),
+          selected: userRole === 'System Manager',
+          onClick: () => updateRole(user, 'System Manager'),
         }),
     },
     {
@@ -187,8 +187,8 @@ function getDropdownOptions(agent) {
         RoleOption({
           role: __('Manager'),
           active: props.active,
-          selected: agentRole === 'Sales Manager',
-          onClick: () => updateRole(agent, 'Sales Manager'),
+          selected: userRole === 'Sales Manager',
+          onClick: () => updateRole(user, 'Sales Manager'),
         }),
     },
     {
@@ -197,8 +197,8 @@ function getDropdownOptions(agent) {
         RoleOption({
           role: __('Sales User'),
           active: props.active,
-          selected: agentRole === 'Sales User',
-          onClick: () => updateRole(agent, 'Sales User'),
+          selected: userRole === 'Sales User',
+          onClick: () => updateRole(user, 'Sales User'),
         }),
     },
   ]
@@ -226,40 +226,37 @@ function RoleOption({ active, role, onClick, selected }) {
   )
 }
 
-function updateRole(agent, newRole) {
-  const currentRole = getUserRole(agent.name)
+function updateRole(user, newRole) {
+  const currentRole = getUserRole(user.name)
   if (currentRole === newRole) return
 
-  call('crm.fcrm.doctype.crm_agent.crm_agent.update_agent_role', {
-    user: agent.name,
+  call('crm.fcrm.doctype.crm_user.crm_user.update_user_role', {
+    user: user.name,
     new_role: newRole,
   }).then(() => {
     toast.success(
-      __('{0} has been granted {1} access', [
-        agent.agent_name,
-        roleMap[newRole],
-      ]),
+      __('{0} has been granted {1} access', [user.user_name, roleMap[newRole]]),
     )
+    usersResource.reload()
     users.reload()
-    agents.reload()
   })
 }
 
-function updateStatus(agent, status) {
-  const currentStatus = agent.is_active
+function updateStatus(user, status) {
+  const currentStatus = user.is_active
   if (currentStatus === status) return
 
-  call('crm.fcrm.doctype.crm_agent.crm_agent.update_agent_status', {
-    agent: agent.name,
+  call('crm.fcrm.doctype.crm_user.crm_user.update_user_status', {
+    user: user.name,
     status,
   }).then(() => {
     toast.success(
       __('{0} has been {1}', [
-        agent.agent_name,
+        user.user_name,
         status ? 'activated' : 'deactivated',
       ]),
     )
-    agents.reload()
+    users.reload()
   })
 }
 
@@ -273,30 +270,30 @@ function changeStatus(status) {
 function updateFilters() {
   const status = currentStatus.value || 'Active'
 
-  agents.filters = {}
+  users.filters = {}
   if (status === 'Active') {
-    agents.filters.is_active = ['=', 1]
+    users.filters.is_active = ['=', 1]
   } else if (status === 'Inactive') {
-    agents.filters.is_active = ['=', 0]
+    users.filters.is_active = ['=', 0]
   }
-  agents.reload()
+  users.reload()
 }
 
 onMounted(() => updateFilters())
 
 const search = ref('')
 watch(search, (newValue) => {
-  agents.filters = {
+  users.filters = {
     is_active: ['=', 1],
-    agent_name: ['like', `%${newValue}%`],
+    user_name: ['like', `%${newValue}%`],
   }
   if (!newValue) {
-    agents.filters = {
+    users.filters = {
       is_active: ['=', 1],
     }
-    agents.start = 0
-    agents.pageLength = 10
+    users.start = 0
+    users.pageLength = 10
   }
-  agents.reload()
+  users.reload()
 })
 </script>

From d0cbad0ab15075f4d99350d70d05ece1b2e7f67e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 12:46:33 +0530
Subject: [PATCH 12/51] fix: updated roles in Invite user page

(cherry picked from commit 2a2c832e0bf4ca6b366fd6f98c99a2081f1d09bf)
---
 frontend/src/components/Settings/InviteUserPage.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Settings/InviteUserPage.vue b/frontend/src/components/Settings/InviteUserPage.vue
index 1b2f193b..a057ac6b 100644
--- a/frontend/src/components/Settings/InviteUserPage.vue
+++ b/frontend/src/components/Settings/InviteUserPage.vue
@@ -29,8 +29,9 @@
           v-model="role"
           :label="__('Invite as')"
           :options="[
-            { label: __('Regular Access'), value: 'Sales User' },
-            { label: __('Manager Access'), value: 'Sales Manager' },
+            { label: __('Sales User'), value: 'Sales User' },
+            { label: __('Manager'), value: 'Sales Manager' },
+            { label: __('Admin'), value: 'System Manager' },
           ]"
           :description="description"
         />
@@ -108,6 +109,8 @@ const error = ref(null)
 
 const description = computed(() => {
   return {
+    'System Manager':
+      'Can manage all aspects of the CRM, including user management, customizations and settings.',
     'Sales Manager':
       'Can manage and invite new agents, and create public & private views (reports).',
     'Sales User':
@@ -116,8 +119,9 @@ const description = computed(() => {
 })
 
 const roleMap = {
-  'Sales User': __('Regular Access'),
-  'Sales Manager': __('Manager Access'),
+  'Sales User': __('Sales User'),
+  'Sales Manager': __('Manager'),
+  'System Manager': __('Admin'),
 }
 
 const inviteByEmail = createResource({

From 142a94e0426f1e98655536aff72cc13ab6b362eb Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 13:01:11 +0530
Subject: [PATCH 13/51] fix: show role options based on logged in user's role

(cherry picked from commit 12213de4780926a16ac07a06eb3ce36aa858047d)
---
 .../components/Settings/InviteUserPage.vue    | 20 ++++++++++++-------
 frontend/src/stores/users.js                  |  5 +++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Settings/InviteUserPage.vue b/frontend/src/components/Settings/InviteUserPage.vue
index a057ac6b..077668ed 100644
--- a/frontend/src/components/Settings/InviteUserPage.vue
+++ b/frontend/src/components/Settings/InviteUserPage.vue
@@ -28,11 +28,7 @@
           class="mt-4"
           v-model="role"
           :label="__('Invite as')"
-          :options="[
-            { label: __('Sales User'), value: 'Sales User' },
-            { label: __('Manager'), value: 'Sales Manager' },
-            { label: __('Admin'), value: 'System Manager' },
-          ]"
+          :options="roleOptions"
           :description="description"
         />
       </div>
@@ -92,6 +88,7 @@
 <script setup>
 import MultiSelectEmailInput from '@/components/Controls/MultiSelectEmailInput.vue'
 import { validateEmail, convertArrayToString } from '@/utils'
+import { usersStore } from '@/stores/users'
 import {
   createListResource,
   createResource,
@@ -102,6 +99,7 @@ import { useOnboarding } from 'frappe-ui/frappe'
 import { ref, computed } from 'vue'
 
 const { updateOnboardingStep } = useOnboarding('frappecrm')
+const { isAdmin, isManager } = usersStore()
 
 const invitees = ref([])
 const role = ref('Sales User')
@@ -112,12 +110,20 @@ const description = computed(() => {
     'System Manager':
       'Can manage all aspects of the CRM, including user management, customizations and settings.',
     'Sales Manager':
-      'Can manage and invite new agents, and create public & private views (reports).',
+      'Can manage and invite new users, and create public & private views (reports).',
     'Sales User':
       'Can work with leads and deals and create private views (reports).',
   }[role.value]
 })
 
+const roleOptions = computed(() => {
+  return [
+    { value: 'Sales User', label: __('Sales User') },
+    ...(isManager() ? [{ value: 'Sales Manager', label: __('Manager') }] : []),
+    ...(isAdmin() ? [{ value: 'System Manager', label: __('Admin') }] : []),
+  ]
+})
+
 const roleMap = {
   'Sales User': __('Sales User'),
   'Sales Manager': __('Manager'),
@@ -134,7 +140,7 @@ const inviteByEmail = createResource({
   },
   onSuccess(data) {
     if (data?.existing_invites?.length) {
-      error.value = __('Agent with email {0} already exists', [
+      error.value = __('User with email {0} already exists', [
         data.existing_invites.join(', '),
       ])
     } else {
diff --git a/frontend/src/stores/users.js b/frontend/src/stores/users.js
index b1e2f41a..1cf35ca5 100644
--- a/frontend/src/stores/users.js
+++ b/frontend/src/stores/users.js
@@ -49,6 +49,10 @@ export const usersStore = defineStore('crm-users', () => {
     return usersByName[email]
   }
 
+  function isAdmin(email) {
+    return getUser(email).is_admin
+  }
+
   function isManager(email) {
     return getUser(email).is_manager
   }
@@ -68,6 +72,7 @@ export const usersStore = defineStore('crm-users', () => {
   return {
     users,
     getUser,
+    isAdmin,
     isManager,
     isAgent,
     getUserRole,

From aac50e1d10796f34cab5cd4cd0893f5cf36a6bd6 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 14:39:56 +0530
Subject: [PATCH 14/51] fix: show role options based on logged in user's role

(cherry picked from commit 2b1b21d2e20435a1306f03322d050b286e77cc65)
---
 frontend/src/components/Settings/Users.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index 684ee726..ec03e140 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -130,7 +130,7 @@ import {
 } from 'frappe-ui'
 import { ref, h, watch, onMounted } from 'vue'
 
-const { users: usersResource, getUserRole } = usersStore()
+const { users: usersResource, getUserRole, isAdmin, isManager } = usersStore()
 
 const users = createListResource({
   doctype: 'CRM User',
@@ -170,7 +170,7 @@ function getMoreOptions(user) {
 
 function getDropdownOptions(user) {
   const userRole = getUserRole(user.name)
-  return [
+  let options = [
     {
       label: __('Admin'),
       component: (props) =>
@@ -180,6 +180,7 @@ function getDropdownOptions(user) {
           selected: userRole === 'System Manager',
           onClick: () => updateRole(user, 'System Manager'),
         }),
+      condition: () => isAdmin(),
     },
     {
       label: __('Manager'),
@@ -190,6 +191,7 @@ function getDropdownOptions(user) {
           selected: userRole === 'Sales Manager',
           onClick: () => updateRole(user, 'Sales Manager'),
         }),
+      condition: () => isManager(),
     },
     {
       label: __('Sales User'),
@@ -202,6 +204,8 @@ function getDropdownOptions(user) {
         }),
     },
   ]
+
+  return options.filter((option) => option.condition?.() || true)
 }
 
 function RoleOption({ active, role, onClick, selected }) {

From f4c033fd52d3af70ac4b7677da774c409055fa75 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 14:57:05 +0530
Subject: [PATCH 15/51] fix: open invite user page from users add new agent
 dropdown option

(cherry picked from commit d244567b3067f2281ec7e5e9b95c035cc87ecad9)
---
 .../src/components/Layouts/AppSidebar.vue     |  2 +-
 frontend/src/components/Settings/Settings.vue |  2 +-
 frontend/src/components/Settings/Users.vue    | 25 +++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index 68e87c82..3a156e0d 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -351,7 +351,7 @@ const steps = reactive([
     onClick: () => {
       minimize.value = true
       showSettings.value = true
-      activeSettingsPage.value = 'Invite Agent'
+      activeSettingsPage.value = 'Invite User'
     },
     condition: () => isManager(),
   },
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index c20984e8..e7f5c9c5 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -28,7 +28,7 @@
                     ? 'bg-surface-selected shadow-sm hover:bg-surface-selected'
                     : 'hover:bg-surface-gray-3'
                 "
-                @click="activeTab = i"
+                @click="activeSettingsPage = i.label"
               />
             </nav>
           </div>
diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index ec03e140..c6d375a3 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -27,11 +27,23 @@
           @change="(e) => changeStatus(e.target.value)"
         >
         </FormControl>
-        <Button
-          :label="__('Add User')"
-          icon-left="plus"
-          variant="solid"
-          @click="$emit('add-user')"
+        <Dropdown
+          :options="[
+            {
+              label: __('Add Existing User'),
+              onClick: () => (showAddExistingModal = true),
+            },
+            {
+              label: __('Invite New User'),
+              onClick: () => (activeSettingsPage = 'Invite User'),
+            },
+          ]"
+          :button="{
+            label: __('New'),
+            iconLeft: 'plus',
+            variant: 'solid',
+          }"
+          placement="right"
         />
       </div>
     </div>
@@ -119,6 +131,7 @@
 
 <script setup>
 import LucideCheck from '~icons/lucide/check'
+import { activeSettingsPage } from '@/composables/settings'
 import { usersStore } from '@/stores/users'
 import {
   Avatar,
@@ -132,6 +145,8 @@ import { ref, h, watch, onMounted } from 'vue'
 
 const { users: usersResource, getUserRole, isAdmin, isManager } = usersStore()
 
+const showAddExistingModal = ref(false)
+
 const users = createListResource({
   doctype: 'CRM User',
   cache: 'CRM Users',

From 512970cad12997f8f45c318378eb4cb0bd491693 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 16:58:35 +0530
Subject: [PATCH 16/51] fix: filter out existing emails

(cherry picked from commit 08bab927a2ad5fa06f3d1a000262e11a35f943fd)
---
 .../components/Controls/MultiSelectEmailInput.vue    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/src/components/Controls/MultiSelectEmailInput.vue b/frontend/src/components/Controls/MultiSelectEmailInput.vue
index 5e3b6cf0..133bfea4 100644
--- a/frontend/src/components/Controls/MultiSelectEmailInput.vue
+++ b/frontend/src/components/Controls/MultiSelectEmailInput.vue
@@ -156,6 +156,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  existingEmails: {
+    type: Array,
+    default: () => [],
+  },
 })
 
 const values = defineModel()
@@ -205,6 +209,14 @@ const filterOptions = createResource({
         value: email,
       }
     })
+
+    // Filter out existing emails
+    if (props.existingEmails?.length) {
+      allData = allData.filter((option) => {
+        return !props.existingEmails.includes(option.value)
+      })
+    }
+
     return allData
   },
 })

From f1935156ecbe4f05722b93f50bc096a50e006b57 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 16:59:02 +0530
Subject: [PATCH 17/51] feat: add existing users

(cherry picked from commit 6873c6db4e100e7225ebd7c461c31eb9f35356da)
---
 crm/fcrm/doctype/crm_user/crm_user.py         |  24 +++-
 frontend/components.d.ts                      |   1 +
 .../Modals/AddExistingUserModal.vue           | 113 ++++++++++++++++++
 frontend/src/components/Settings/Settings.vue |   3 +-
 frontend/src/components/Settings/Users.vue    |   6 +
 5 files changed, 143 insertions(+), 4 deletions(-)
 create mode 100644 frontend/src/components/Modals/AddExistingUserModal.vue

diff --git a/crm/fcrm/doctype/crm_user/crm_user.py b/crm/fcrm/doctype/crm_user/crm_user.py
index 98c74d51..2bc585a8 100644
--- a/crm/fcrm/doctype/crm_user/crm_user.py
+++ b/crm/fcrm/doctype/crm_user/crm_user.py
@@ -21,6 +21,26 @@ class CRMUser(Document):
 				self.image = user.user_image
 
 
+@frappe.whitelist()
+def add_existing_users(users, role='Sales User'):
+	"""
+	Add existing users to the CRM User doctype.
+	:param users: List of user names to be added
+	"""
+	frappe.only_for(["System Manager", "Sales Manager"])
+	users = frappe.parse_json(users)
+
+	for user in users:
+		if not frappe.db.exists("CRM User", {"user": user}):
+			new_user = frappe.new_doc("CRM User")
+			new_user.user = user
+			new_user.save(ignore_permissions=True)
+
+			update_user_role(user, role)
+		else:
+			frappe.throw(f"User {user} already exists")
+
+
 @frappe.whitelist()
 def update_user_role(user, new_role):
 	"""
@@ -29,7 +49,7 @@ def update_user_role(user, new_role):
 	:param new_role: The new role to assign (Sales Manager or Sales User)
 	"""
 
-	frappe.only_for(["System Manager", "System Manager"])
+	frappe.only_for(["System Manager", "Sales Manager"])
 
 	if new_role not in ["System Manager", "Sales Manager", "Sales User"]:
 		frappe.throw("Cannot assign this role")
@@ -55,6 +75,6 @@ def update_user_status(user, status):
 	:param user: The name of the user
 	:param status: The status to set (1 for active, 0 for inactive)
 	"""
-	frappe.only_for("Sales Manager")
+	frappe.only_for(["System Manager", "Sales Manager"])
 
 	frappe.db.set_value("CRM User", user, "is_active", status)
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 4c5b3699..8dd7f4d4 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -12,6 +12,7 @@ declare module 'vue' {
     Activities: typeof import('./src/components/Activities/Activities.vue')['default']
     ActivityHeader: typeof import('./src/components/Activities/ActivityHeader.vue')['default']
     ActivityIcon: typeof import('./src/components/Icons/ActivityIcon.vue')['default']
+    AddExistingUserModal: typeof import('./src/components/Modals/AddExistingUserModal.vue')['default']
     AddressIcon: typeof import('./src/components/Icons/AddressIcon.vue')['default']
     AddressModal: typeof import('./src/components/Modals/AddressModal.vue')['default']
     Agents: typeof import('./src/components/Settings/Agents.vue')['default']
diff --git a/frontend/src/components/Modals/AddExistingUserModal.vue b/frontend/src/components/Modals/AddExistingUserModal.vue
new file mode 100644
index 00000000..d196946f
--- /dev/null
+++ b/frontend/src/components/Modals/AddExistingUserModal.vue
@@ -0,0 +1,113 @@
+<template>
+  <Dialog
+    v-model="show"
+    :options="{ title: __('Add Existing User') }"
+    @close="show = false"
+  >
+    <template #body-content>
+      <div class="flex gap-1 border rounded mb-4 p-2 text-ink-gray-5">
+        <FeatherIcon name="info" class="size-3.5" />
+        <p class="text-sm">
+          {{
+            __(
+              'Add existing system users to this CRM. Assign them a role to grant access with their current credentials.',
+            )
+          }}
+        </p>
+      </div>
+
+      <label class="block text-xs text-ink-gray-5 mb-1.5">
+        {{ __('Users') }}
+      </label>
+
+      <div class="p-2 group bg-surface-gray-2 hover:bg-surface-gray-3 rounded">
+        <MultiSelectEmailInput
+          class="flex-1"
+          inputClass="!bg-surface-gray-2 hover:!bg-surface-gray-3 group-hover:!bg-surface-gray-3"
+          :placeholder="__('john@doe.com')"
+          v-model="newUsers"
+          :validate="validateEmail"
+          :existingEmails="props.users.data.map((user) => user.name)"
+          :error-message="
+            (value) => __('{0} is an invalid email address', [value])
+          "
+        />
+      </div>
+      <FormControl
+        type="select"
+        class="mt-4"
+        v-model="role"
+        :label="__('Role')"
+        :options="roleOptions"
+        :description="description"
+      />
+    </template>
+    <template #actions>
+      <div class="flex justify-end gap-2">
+        <Button
+          variant="solid"
+          :label="__('Add')"
+          :disabled="!newUsers.length"
+          @click="addNewUser.submit()"
+          :loading="addNewUser.loading"
+        />
+      </div>
+    </template>
+  </Dialog>
+</template>
+
+<script setup>
+import MultiSelectEmailInput from '@/components/Controls/MultiSelectEmailInput.vue'
+import { validateEmail } from '@/utils'
+import { usersStore } from '@/stores/users'
+import { createResource, toast } from 'frappe-ui'
+import { ref, computed } from 'vue'
+
+const { users: usersResource, isAdmin, isManager } = usersStore()
+
+const show = defineModel()
+
+const props = defineProps({
+  users: Object,
+})
+
+const newUsers = ref([])
+const role = ref('Sales User')
+
+const description = computed(() => {
+  return {
+    'System Manager':
+      'Can manage all aspects of the CRM, including user management, customizations and settings.',
+    'Sales Manager':
+      'Can manage and invite new users, and create public & private views (reports).',
+    'Sales User':
+      'Can work with leads and deals and create private views (reports).',
+  }[role.value]
+})
+
+const roleOptions = computed(() => {
+  return [
+    { value: 'Sales User', label: __('Sales User') },
+    ...(isManager() ? [{ value: 'Sales Manager', label: __('Manager') }] : []),
+    ...(isAdmin() ? [{ value: 'System Manager', label: __('Admin') }] : []),
+  ]
+})
+
+const addNewUser = createResource({
+  url: 'crm.fcrm.doctype.crm_user.crm_user.add_existing_users',
+  makeParams: () => ({
+    users: JSON.stringify(newUsers.value),
+    role: role.value,
+  }),
+  onSuccess: () => {
+    toast.success(__('Users added successfully'))
+    newUsers.value = []
+    show.value = false
+    usersResource.reload()
+    props.users.list.reload()
+  },
+  onError: (error) => {
+    toast.error(error.messages[0] || __('Failed to add users'))
+  },
+})
+</script>
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index e7f5c9c5..a46c29bc 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -44,7 +44,6 @@
 import WhatsAppIcon from '@/components/Icons/WhatsAppIcon.vue'
 import ERPNextIcon from '@/components/Icons/ERPNextIcon.vue'
 import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
-import InviteIcon from '@/components/Icons/InviteIcon.vue'
 import Email2Icon from '@/components/Icons/Email2Icon.vue'
 import Users from '@/components/Settings/Users.vue'
 import GeneralSettings from '@/components/Settings/GeneralSettings.vue'
@@ -97,7 +96,7 @@ const tabs = computed(() => {
         },
         {
           label: __('Invite User'),
-          icon: InviteIcon,
+          icon: 'user-plus',
           component: markRaw(InviteUserPage),
           condition: () => isManager(),
         },
diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index c6d375a3..2361e34d 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -127,10 +127,16 @@
       </div>
     </ul>
   </div>
+  <AddExistingUserModal
+    v-if="showAddExistingModal"
+    v-model="showAddExistingModal"
+    :users="users"
+  />
 </template>
 
 <script setup>
 import LucideCheck from '~icons/lucide/check'
+import AddExistingUserModal from '@/components/Modals/AddExistingUserModal.vue'
 import { activeSettingsPage } from '@/composables/settings'
 import { usersStore } from '@/stores/users'
 import {

From eb7ded961ad4b290ce3d073a466f45deee532154 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 17:33:57 +0530
Subject: [PATCH 18/51] fix: create crm user on accepting invite

(cherry picked from commit 03abe0b5cd24e3a9e7bcdfdb17f701b53026db4f)

# Conflicts:
#	crm/api/__init__.py
---
 crm/api/__init__.py                               | 15 +++++++++++++--
 .../doctype/crm_invitation/crm_invitation.json    |  7 ++++---
 crm/fcrm/doctype/crm_invitation/crm_invitation.py | 10 +++++++++-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/crm/api/__init__.py b/crm/api/__init__.py
index e7f86e1b..759bdab0 100644
--- a/crm/api/__init__.py
+++ b/crm/api/__init__.py
@@ -70,7 +70,7 @@ def check_app_permission():
 
 	roles = frappe.get_roles()
 	if any(
-		role in ["System Manager", "Sales User", "Sales Manager", "Sales Master Manager"] for role in roles
+		role in ["System Manager", "Sales User", "Sales Manager"] for role in roles
 	):
 		return True
 
@@ -98,7 +98,15 @@ def accept_invitation(key: str | None = None):
 
 @frappe.whitelist()
 def invite_by_email(emails: str, role: str):
+<<<<<<< HEAD
 	frappe.only_for("Sales Manager")
+=======
+	frappe.only_for(["Sales Manager", "System Manager"])
+
+	if role not in ["System Manager", "Sales Manager", "Sales User"]:
+		frappe.throw("Cannot invite for this role")
+
+>>>>>>> 03abe0b5 (fix: create crm user on accepting invite)
 	if not emails:
 		return
 	email_string = validate_email_address(emails, throw=False)
@@ -108,7 +116,10 @@ def invite_by_email(emails: str, role: str):
 	existing_members = frappe.db.get_all("User", filters={"email": ["in", email_list]}, pluck="email")
 	existing_invites = frappe.db.get_all(
 		"CRM Invitation",
-		filters={"email": ["in", email_list], "role": ["in", ["Sales Manager", "Sales User"]]},
+		filters={
+			"email": ["in", email_list],
+			"role": ["in", ["System Manager", "Sales Manager", "Sales User"]],
+		},
 		pluck="email",
 	)
 
diff --git a/crm/fcrm/doctype/crm_invitation/crm_invitation.json b/crm/fcrm/doctype/crm_invitation/crm_invitation.json
index f5902d6e..826a2b33 100644
--- a/crm/fcrm/doctype/crm_invitation/crm_invitation.json
+++ b/crm/fcrm/doctype/crm_invitation/crm_invitation.json
@@ -27,7 +27,7 @@
    "fieldtype": "Select",
    "in_list_view": 1,
    "label": "Role",
-   "options": "\nSales User\nSales Manager",
+   "options": "\nSales User\nSales Manager\nSystem Manager",
    "reqd": 1
   },
   {
@@ -66,7 +66,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-03 14:59:29.450018",
+ "modified": "2025-06-17 17:20:18.935395",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Invitation",
@@ -106,7 +106,8 @@
    "share": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
\ No newline at end of file
+}
diff --git a/crm/fcrm/doctype/crm_invitation/crm_invitation.py b/crm/fcrm/doctype/crm_invitation/crm_invitation.py
index 625cd882..9b07cd53 100644
--- a/crm/fcrm/doctype/crm_invitation/crm_invitation.py
+++ b/crm/fcrm/doctype/crm_invitation/crm_invitation.py
@@ -35,7 +35,7 @@ class CRMInvitation(Document):
 
 	@frappe.whitelist()
 	def accept_invitation(self):
-		frappe.only_for("System Manager")
+		frappe.only_for(["System Manager", "Sales Manager"])
 		self.accept()
 
 	def accept(self):
@@ -52,6 +52,14 @@ class CRMInvitation(Document):
 		self.accepted_at = frappe.utils.now()
 		self.save(ignore_permissions=True)
 
+		# create CRM User record
+		if not frappe.db.exists("CRM User", {"user": user.name}):
+			crm_user = frappe.get_doc(
+				doctype="CRM User",
+				user=user.name,
+			)
+			crm_user.insert(ignore_permissions=True)
+
 	def update_module_in_user(self, user, module):
 		block_modules = frappe.get_all(
 			"Module Def",

From 54b3802061b72c7f040a9cb3cbecb1cd5f8a2da8 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 20:20:13 +0530
Subject: [PATCH 19/51] feat: update password modal

(cherry picked from commit fb2f105520827e2fb439da230b43ed90892ed329)
---
 frontend/components.d.ts                      |  1 +
 .../components/Modals/ChangePasswordModal.vue | 65 +++++++++++++++++++
 .../components/Settings/ProfileSettings.vue   | 25 +++----
 3 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 frontend/src/components/Modals/ChangePasswordModal.vue

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 8dd7f4d4..81fdbc6f 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -40,6 +40,7 @@ declare module 'vue' {
     CallUI: typeof import('./src/components/Telephony/CallUI.vue')['default']
     CameraIcon: typeof import('./src/components/Icons/CameraIcon.vue')['default']
     CertificateIcon: typeof import('./src/components/Icons/CertificateIcon.vue')['default']
+    ChangePasswordModal: typeof import('./src/components/Modals/ChangePasswordModal.vue')['default']
     CheckCircleIcon: typeof import('./src/components/Icons/CheckCircleIcon.vue')['default']
     CheckIcon: typeof import('./src/components/Icons/CheckIcon.vue')['default']
     CollapseSidebar: typeof import('./src/components/Icons/CollapseSidebar.vue')['default']
diff --git a/frontend/src/components/Modals/ChangePasswordModal.vue b/frontend/src/components/Modals/ChangePasswordModal.vue
new file mode 100644
index 00000000..19bed6aa
--- /dev/null
+++ b/frontend/src/components/Modals/ChangePasswordModal.vue
@@ -0,0 +1,65 @@
+<template>
+  <Dialog v-model="show" :options="{ title: __('Change Password') }">
+    <template #body-content>
+      <Password
+        v-model="newPassword"
+        :label="__('New Password')"
+        class="mb-4"
+      />
+      <Password v-model="confirmPassword" :label="__('Confirm Password')" />
+    </template>
+    <template #actions>
+      <div class="flex justify-between items-center">
+        <div>
+          <ErrorMessage :message="error" />
+        </div>
+        <Button
+          variant="solid"
+          :label="__('Update')"
+          :disabled="
+            !newPassword || !confirmPassword || newPassword !== confirmPassword
+          "
+          :loading="updatePassword.loading"
+          @click="updatePassword.submit()"
+        />
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup>
+import Password from '@/components/Controls/Password.vue'
+import { usersStore } from '@/stores/users'
+import { Dialog, toast, createResource } from 'frappe-ui'
+import { ref } from 'vue'
+
+const show = defineModel()
+
+const { getUser } = usersStore()
+
+const newPassword = ref('')
+const confirmPassword = ref('')
+
+const error = ref('')
+
+const updatePassword = createResource({
+  url: 'frappe.client.set_value',
+  makeParams() {
+    return {
+      doctype: 'User',
+      name: getUser().name,
+      fieldname: 'new_password',
+      value: newPassword.value,
+    }
+  },
+  onSuccess: () => {
+    toast.success(__('Password updated successfully'))
+    show.value = false
+    newPassword.value = ''
+    confirmPassword.value = ''
+    error.value = ''
+  },
+  onError: (err) => {
+    error.value = err.messages[0] || __('Failed to update password')
+  },
+})
+</script>
diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index 68a0128f..919b3f6c 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -16,8 +16,13 @@
           </div>
         </div>
         <Button
-          :label="__('Edit profile photo')"
-          @click="showEditProfilePhotoModal = true"
+          :label="__('Change Password')"
+          icon-left="lock"
+          @click="showChangePasswordModal = true"
+        />
+        <ChangePasswordModal
+          v-if="showChangePasswordModal"
+          v-model="showChangePasswordModal"
         />
         <Dialog
           :options="{ title: __('Edit profile photo') }"
@@ -50,19 +55,6 @@
             v-model="profile.last_name"
           />
         </div>
-        <div class="flex justify-between gap-4">
-          <FormControl
-            class="w-full"
-            label="Email"
-            v-model="profile.email"
-            :disabled="true"
-          />
-          <Password
-            class="w-full"
-            label="Set new password"
-            v-model="profile.new_password"
-          />
-        </div>
       </div>
     </div>
     <div class="flex justify-between flex-row-reverse">
@@ -77,7 +69,7 @@
   </div>
 </template>
 <script setup>
-import Password from '@/components/Controls/Password.vue'
+import ChangePasswordModal from '@/components/Modals/ChangePasswordModal.vue'
 import ProfileImageEditor from '@/components/Settings/ProfileImageEditor.vue'
 import { usersStore } from '@/stores/users'
 import { Dialog, Avatar, createResource, ErrorMessage, toast } from 'frappe-ui'
@@ -90,6 +82,7 @@ const { updateOnboardingStep } = useOnboarding('frappecrm')
 const user = computed(() => getUser() || {})
 
 const showEditProfilePhotoModal = ref(false)
+const showChangePasswordModal = ref(false)
 
 const profile = ref({})
 const loading = ref(false)

From b047dab16dd838590a9537f017b14eb84c8fbfb0 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 23:12:43 +0530
Subject: [PATCH 20/51] fix: capture onboarding step event of setting up
 password

(cherry picked from commit 3234102e55356b85aff619557e8f53a614df045b)
---
 frontend/src/components/Modals/ChangePasswordModal.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/components/Modals/ChangePasswordModal.vue b/frontend/src/components/Modals/ChangePasswordModal.vue
index 19bed6aa..72268f44 100644
--- a/frontend/src/components/Modals/ChangePasswordModal.vue
+++ b/frontend/src/components/Modals/ChangePasswordModal.vue
@@ -30,11 +30,13 @@
 import Password from '@/components/Controls/Password.vue'
 import { usersStore } from '@/stores/users'
 import { Dialog, toast, createResource } from 'frappe-ui'
+import { useOnboarding } from 'frappe-ui/frappe'
 import { ref } from 'vue'
 
 const show = defineModel()
 
 const { getUser } = usersStore()
+const { updateOnboardingStep } = useOnboarding('frappecrm')
 
 const newPassword = ref('')
 const confirmPassword = ref('')
@@ -52,6 +54,7 @@ const updatePassword = createResource({
     }
   },
   onSuccess: () => {
+    updateOnboardingStep('setup_your_password')
     toast.success(__('Password updated successfully'))
     show.value = false
     newPassword.value = ''

From bce5eef2c917dc3817b841a243d5ee6d848cf94f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 23:13:04 +0530
Subject: [PATCH 21/51] refactor: profile page

(cherry picked from commit fad7c5985c05a87386b9d1ea1286398a3ea642e5)

# Conflicts:
#	frontend/components.d.ts
#	frontend/src/components/Settings/ProfileImageEditor.vue
---
 frontend/components.d.ts                      |   7 +-
 .../components/Settings/ProfileSettings.vue   | 192 +++++++++++-------
 2 files changed, 117 insertions(+), 82 deletions(-)

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 81fdbc6f..cb91c60a 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -15,7 +15,6 @@ declare module 'vue' {
     AddExistingUserModal: typeof import('./src/components/Modals/AddExistingUserModal.vue')['default']
     AddressIcon: typeof import('./src/components/Icons/AddressIcon.vue')['default']
     AddressModal: typeof import('./src/components/Modals/AddressModal.vue')['default']
-    Agents: typeof import('./src/components/Settings/Agents.vue')['default']
     AllModals: typeof import('./src/components/Activities/AllModals.vue')['default']
     AppHeader: typeof import('./src/components/Layouts/AppHeader.vue')['default']
     Apps: typeof import('./src/components/Apps.vue')['default']
@@ -138,7 +137,6 @@ declare module 'vue' {
     InboundCallIcon: typeof import('./src/components/Icons/InboundCallIcon.vue')['default']
     InboxIcon: typeof import('./src/components/Icons/InboxIcon.vue')['default']
     IndicatorIcon: typeof import('./src/components/Icons/IndicatorIcon.vue')['default']
-    InviteAgentPage: typeof import('./src/components/Settings/InviteAgentPage.vue')['default']
     InviteIcon: typeof import('./src/components/Icons/InviteIcon.vue')['default']
     InviteUserPage: typeof import('./src/components/Settings/InviteUserPage.vue')['default']
     KanbanIcon: typeof import('./src/components/Icons/KanbanIcon.vue')['default']
@@ -155,6 +153,10 @@ declare module 'vue' {
     ListIcon: typeof import('./src/components/Icons/ListIcon.vue')['default']
     ListRows: typeof import('./src/components/ListViews/ListRows.vue')['default']
     LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default']
+<<<<<<< HEAD
+=======
+    LucideInfo: typeof import('~icons/lucide/info')['default']
+>>>>>>> fad7c598 (refactor: profile page)
     LucidePlus: typeof import('~icons/lucide/plus')['default']
     MarkAsDoneIcon: typeof import('./src/components/Icons/MarkAsDoneIcon.vue')['default']
     MaximizeIcon: typeof import('./src/components/Icons/MaximizeIcon.vue')['default']
@@ -187,7 +189,6 @@ declare module 'vue' {
     PlaybackSpeedOption: typeof import('./src/components/Activities/PlaybackSpeedOption.vue')['default']
     PlayIcon: typeof import('./src/components/Icons/PlayIcon.vue')['default']
     Popover: typeof import('./src/components/frappe-ui/Popover.vue')['default']
-    ProfileImageEditor: typeof import('./src/components/Settings/ProfileImageEditor.vue')['default']
     ProfileSettings: typeof import('./src/components/Settings/ProfileSettings.vue')['default']
     QuickEntryModal: typeof import('./src/components/Modals/QuickEntryModal.vue')['default']
     QuickFilterField: typeof import('./src/components/QuickFilterField.vue')['default']
diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index 919b3f6c..e22d532b 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -2,19 +2,65 @@
   <div class="flex h-full flex-col gap-8 p-8 text-ink-gray-9">
     <div class="flex-1 flex flex-col gap-8 mt-2 overflow-y-auto">
       <div v-if="profile" class="flex w-full items-center justify-between">
-        <div class="flex items-center gap-4">
-          <Avatar
-            class="!size-16"
-            :image="profile.user_image"
-            :label="profile.full_name"
-          />
-          <div class="flex flex-col gap-1">
-            <span class="text-2xl font-semibold text-ink-gray-9">{{
-              profile.full_name
-            }}</span>
-            <span class="text-base text-ink-gray-7">{{ profile.email }}</span>
-          </div>
-        </div>
+        <FileUploader
+          @success="(file) => updateImage(file.file_url)"
+          :validateFile="validateFile"
+        >
+          <template #default="{ openFileSelector, error: _error }">
+            <div class="flex items-center gap-4">
+              <div class="group relative !size-[66px]">
+                <Avatar
+                  class="!size-16"
+                  :image="profile.user_image"
+                  :label="profile.full_name"
+                />
+                <component
+                  :is="profile.user_image ? Dropdown : 'div'"
+                  v-bind="
+                    profile.user_image
+                      ? {
+                          options: [
+                            {
+                              icon: 'upload',
+                              label: profile.user_image
+                                ? __('Change image')
+                                : __('Upload image'),
+                              onClick: openFileSelector,
+                            },
+                            {
+                              icon: 'trash-2',
+                              label: __('Remove image'),
+                              onClick: () => updateImage(),
+                            },
+                          ],
+                        }
+                      : { onClick: openFileSelector }
+                  "
+                  class="!absolute bottom-0 left-0 right-0"
+                >
+                  <div
+                    class="z-1 absolute bottom-0.5 left-0 right-0.5 flex h-9 cursor-pointer items-center justify-center rounded-b-full bg-black bg-opacity-40 pt-3 opacity-0 duration-300 ease-in-out group-hover:opacity-100"
+                    style="
+                      -webkit-clip-path: inset(12px 0 0 0);
+                      clip-path: inset(12px 0 0 0);
+                    "
+                  >
+                    <CameraIcon class="size-4 cursor-pointer text-white" />
+                  </div>
+                </component>
+              </div>
+              <div class="flex flex-col gap-1">
+                <span class="text-2xl font-semibold text-ink-gray-9">
+                  {{ profile.full_name }}
+                </span>
+                <span class="text-base text-ink-gray-7">
+                  {{ profile.email }}
+                </span>
+                <ErrorMessage :message="__(_error)" />
+              </div>
+            </div>
+          </template>
+        </FileUploader>
         <Button
           :label="__('Change Password')"
           icon-left="lock"
@@ -24,113 +70,101 @@
           v-if="showChangePasswordModal"
           v-model="showChangePasswordModal"
         />
-        <Dialog
-          :options="{ title: __('Edit profile photo') }"
-          v-model="showEditProfilePhotoModal"
-        >
-          <template #body-content>
-            <ProfileImageEditor v-model="profile" />
-          </template>
-          <template #actions>
-            <Button
-              variant="solid"
-              class="w-full"
-              :loading="loading"
-              @click="updateUser"
-              :label="__('Save')"
-            />
-          </template>
-        </Dialog>
       </div>
       <div class="flex flex-col gap-4">
         <div class="flex justify-between gap-4">
           <FormControl
             class="w-full"
-            label="First name"
+            :label="__('First name')"
             v-model="profile.first_name"
           />
           <FormControl
             class="w-full"
-            label="Last name"
+            :label="__('Last name')"
             v-model="profile.last_name"
           />
         </div>
       </div>
     </div>
-    <div class="flex justify-between flex-row-reverse">
+    <div class="flex justify-between items-center">
+      <div>
+        <ErrorMessage :message="error" />
+      </div>
       <Button
         variant="solid"
         :label="__('Update')"
-        :loading="loading"
-        @click="updateUser"
+        :disabled="!dirty"
+        :loading="setUser.loading"
+        @click="setUser.submit()"
       />
-      <ErrorMessage :message="error" />
     </div>
   </div>
 </template>
 <script setup>
+import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import ChangePasswordModal from '@/components/Modals/ChangePasswordModal.vue'
-import ProfileImageEditor from '@/components/Settings/ProfileImageEditor.vue'
 import { usersStore } from '@/stores/users'
-import { Dialog, Avatar, createResource, ErrorMessage, toast } from 'frappe-ui'
-import { useOnboarding } from 'frappe-ui/frappe'
+import {
+  Dropdown,
+  FileUploader,
+  Avatar,
+  createResource,
+  toast,
+} from 'frappe-ui'
 import { ref, computed, onMounted } from 'vue'
 
 const { getUser, users } = usersStore()
-const { updateOnboardingStep } = useOnboarding('frappecrm')
 
 const user = computed(() => getUser() || {})
 
-const showEditProfilePhotoModal = ref(false)
 const showChangePasswordModal = ref(false)
 
 const profile = ref({})
-const loading = ref(false)
 const error = ref('')
 
-function updateUser() {
-  loading.value = true
+const dirty = computed(() => {
+  return (
+    profile.value.first_name !== user.value.first_name ||
+    profile.value.last_name !== user.value.last_name
+  )
+})
 
-  let passwordUpdated = false
-
-  if (profile.value.new_password) {
-    passwordUpdated = true
-  }
-
-  const fieldname = {
-    first_name: profile.value.first_name,
-    last_name: profile.value.last_name,
-    user_image: profile.value.user_image,
-    email: profile.value.email,
-    new_password: profile.value.new_password,
-  }
-  createResource({
-    url: 'frappe.client.set_value',
-    params: {
+const setUser = createResource({
+  url: 'frappe.client.set_value',
+  makeParams() {
+    return {
       doctype: 'User',
       name: user.value.name,
-      fieldname,
-    },
-    auto: true,
-    onSuccess: () => {
-      if (passwordUpdated) {
-        updateOnboardingStep('setup_your_password')
-      }
-      loading.value = false
-      error.value = ''
-      profile.value.new_password = ''
-      showEditProfilePhotoModal.value = false
-      toast.success(__('Profile updated successfully'))
-      users.reload()
-    },
-    onError: (err) => {
-      loading.value = false
-      error.value = err.message
-    },
-  })
+      fieldname: {
+        first_name: profile.value.first_name,
+        last_name: profile.value.last_name,
+        user_image: profile.value.user_image,
+      },
+    }
+  },
+  onSuccess: () => {
+    error.value = ''
+    toast.success(__('Profile updated successfully'))
+    users.reload()
+  },
+  onError: (err) => {
+    error.value = err.messages[0] || __('Failed to update profile')
+  },
+})
+
+function updateImage(fileUrl = '') {
+  profile.value.user_image = fileUrl
+  setUser.submit()
 }
 
 onMounted(() => {
   profile.value = { ...user.value }
 })
+
+function validateFile(file) {
+  let extn = file.name.split('.').pop().toLowerCase()
+  if (!['png', 'jpg', 'jpeg'].includes(extn)) {
+    return __('Only PNG and JPG images are allowed')
+  }
+}
 </script>

From 0520df04d07dd9d180ed78190153d6b40756af2b Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 23:15:17 +0530
Subject: [PATCH 22/51] fix: updated components.d.ts

(cherry picked from commit dd1229309fb8d035f9c4670cbd61ea2878fc99f8)

# Conflicts:
#	frontend/components.d.ts
---
 frontend/components.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index cb91c60a..6f43e936 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -154,10 +154,13 @@ declare module 'vue' {
     ListRows: typeof import('./src/components/ListViews/ListRows.vue')['default']
     LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default']
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     LucideInfo: typeof import('~icons/lucide/info')['default']
 >>>>>>> fad7c598 (refactor: profile page)
     LucidePlus: typeof import('~icons/lucide/plus')['default']
+=======
+>>>>>>> dd122930 (fix: updated components.d.ts)
     MarkAsDoneIcon: typeof import('./src/components/Icons/MarkAsDoneIcon.vue')['default']
     MaximizeIcon: typeof import('./src/components/Icons/MaximizeIcon.vue')['default']
     MenuIcon: typeof import('./src/components/Icons/MenuIcon.vue')['default']

From de7cf372e73fa245c9e85cf241a118da05a21525 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 23:22:44 +0530
Subject: [PATCH 23/51] fix: only show users to manager

(cherry picked from commit 22856351fd9613f654df319f1714aafc5c4f626f)
---
 crm/fcrm/doctype/crm_user/crm_user.json       | 14 +++++++++++++-
 frontend/src/components/Settings/Settings.vue |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/crm/fcrm/doctype/crm_user/crm_user.json b/crm/fcrm/doctype/crm_user/crm_user.json
index 5ba7f5e0..1f7f119c 100644
--- a/crm/fcrm/doctype/crm_user/crm_user.json
+++ b/crm/fcrm/doctype/crm_user/crm_user.json
@@ -72,7 +72,7 @@
  "image_field": "image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-06-17 12:08:16.616216",
+ "modified": "2025-06-17 23:17:19.996659",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM User",
@@ -90,6 +90,18 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
+   "write": 1
   }
  ],
  "row_format": "Dynamic",
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index a46c29bc..612e67a2 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -93,6 +93,7 @@ const tabs = computed(() => {
           label: __('Users'),
           icon: 'user',
           component: markRaw(Users),
+          condition: () => isManager(),
         },
         {
           label: __('Invite User'),

From f3b8d8720420e24b9049175ff50d4107131b8a00 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 23:33:17 +0530
Subject: [PATCH 24/51] fix: updated components.d.ts

(cherry picked from commit 56425254a9139f3c582dcb90c4fa72ad922da3b8)

# Conflicts:
#	frontend/components.d.ts
---
 frontend/components.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 6f43e936..e3fd7378 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -155,12 +155,18 @@ declare module 'vue' {
     LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default']
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     LucideInfo: typeof import('~icons/lucide/info')['default']
 >>>>>>> fad7c598 (refactor: profile page)
     LucidePlus: typeof import('~icons/lucide/plus')['default']
 =======
 >>>>>>> dd122930 (fix: updated components.d.ts)
+=======
+    LucideInfo: typeof import('~icons/lucide/info')['default']
+    LucidePlus: typeof import('~icons/lucide/plus')['default']
+    LucideSearch: typeof import('~icons/lucide/search')['default']
+>>>>>>> 56425254 (fix: updated components.d.ts)
     MarkAsDoneIcon: typeof import('./src/components/Icons/MarkAsDoneIcon.vue')['default']
     MaximizeIcon: typeof import('./src/components/Icons/MaximizeIcon.vue')['default']
     MenuIcon: typeof import('./src/components/Icons/MenuIcon.vue')['default']

From 1f1ee74b7490c7dbdff6365bcd30a6c51e510fff Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Tue, 17 Jun 2025 23:40:58 +0530
Subject: [PATCH 25/51] Discard changes to
 frontend/src/components/Settings/ProfileImageEditor.vue

(cherry picked from commit 675bcb549d5b60bc904c2d2d9f9098bf9b74cd66)

# Conflicts:
#	frontend/src/components/Settings/ProfileImageEditor.vue
---
 .../components/Settings/ProfileImageEditor.vue  | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/frontend/src/components/Settings/ProfileImageEditor.vue b/frontend/src/components/Settings/ProfileImageEditor.vue
index 26a14e88..07c1fc3a 100644
--- a/frontend/src/components/Settings/ProfileImageEditor.vue
+++ b/frontend/src/components/Settings/ProfileImageEditor.vue
@@ -1,7 +1,11 @@
 <template>
   <FileUploader
     @success="(file) => setUserImage(file.file_url)"
+<<<<<<< HEAD
     :validateFile="validateIsImageFile"
+=======
+    :validateFile="validateFile"
+>>>>>>> 675bcb54 (Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue)
   >
     <template v-slot="{ file, progress, error, uploading, openFileSelector }">
       <div class="flex flex-col items-center">
@@ -48,11 +52,24 @@
 </template>
 <script setup>
 import { FileUploader } from 'frappe-ui'
+<<<<<<< HEAD
 import { validateIsImageFile } from '@/utils';
+=======
+>>>>>>> 675bcb54 (Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue)
 
 const profile = defineModel()
 
 function setUserImage(url) {
   profile.value.user_image = url
 }
+<<<<<<< HEAD
+=======
+
+function validateFile(file) {
+  let extn = file.name.split('.').pop().toLowerCase()
+  if (!['png', 'jpg'].includes(extn)) {
+    return 'Only PNG and JPG images are allowed'
+  }
+}
+>>>>>>> 675bcb54 (Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue)
 </script>

From cc8868d8925b4c9840f2e81b2a5d5b5ed8630870 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Tue, 17 Jun 2025 23:42:20 +0530
Subject: [PATCH 26/51] chore: resolved conflict

(cherry picked from commit efd03141f0121eed09958741d95d5b457010e03f)

# Conflicts:
#	frontend/components.d.ts
---
 frontend/components.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index e3fd7378..ba7f78d4 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -156,6 +156,7 @@ declare module 'vue' {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     LucideInfo: typeof import('~icons/lucide/info')['default']
 >>>>>>> fad7c598 (refactor: profile page)
@@ -163,6 +164,9 @@ declare module 'vue' {
 =======
 >>>>>>> dd122930 (fix: updated components.d.ts)
 =======
+=======
+    LucideCalendar: typeof import('~icons/lucide/calendar')['default']
+>>>>>>> efd03141 (chore: resolved conflict)
     LucideInfo: typeof import('~icons/lucide/info')['default']
     LucidePlus: typeof import('~icons/lucide/plus')['default']
     LucideSearch: typeof import('~icons/lucide/search')['default']

From a6e8e64d49c1c108895ff19a8e121381fa048bf9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 23:46:28 +0530
Subject: [PATCH 27/51] fix: use validateIsImageFile from utils

(cherry picked from commit 15fd763de8cb4cb9045a4e68f0647b6dc21f32cc)
---
 frontend/src/components/Settings/ProfileSettings.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index e22d532b..c28ae63b 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -4,7 +4,7 @@
       <div v-if="profile" class="flex w-full items-center justify-between">
         <FileUploader
           @success="(file) => updateImage(file.file_url)"
-          :validateFile="validateFile"
+          :validateFile="validateIsImageFile"
         >
           <template #default="{ openFileSelector, error: _error }">
             <div class="flex items-center gap-4">
@@ -104,6 +104,7 @@
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import ChangePasswordModal from '@/components/Modals/ChangePasswordModal.vue'
 import { usersStore } from '@/stores/users'
+import { validateIsImageFile } from '@/utils'
 import {
   Dropdown,
   FileUploader,
@@ -160,11 +161,4 @@ function updateImage(fileUrl = '') {
 onMounted(() => {
   profile.value = { ...user.value }
 })
-
-function validateFile(file) {
-  let extn = file.name.split('.').pop().toLowerCase()
-  if (!['png', 'jpg', 'jpeg'].includes(extn)) {
-    return __('Only PNG and JPG images are allowed')
-  }
-}
 </script>

From f48b664679bfa1fd8c4be4282127e9f206844ad2 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 17 Jun 2025 23:46:53 +0530
Subject: [PATCH 28/51] fix: updated components.d.ts

(cherry picked from commit 4c7269e357cc44a7a4f7b15d698bc876c60acef4)

# Conflicts:
#	frontend/components.d.ts
---
 frontend/components.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index ba7f78d4..3949f767 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -157,6 +157,7 @@ declare module 'vue' {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     LucideInfo: typeof import('~icons/lucide/info')['default']
 >>>>>>> fad7c598 (refactor: profile page)
@@ -171,6 +172,11 @@ declare module 'vue' {
     LucidePlus: typeof import('~icons/lucide/plus')['default']
     LucideSearch: typeof import('~icons/lucide/search')['default']
 >>>>>>> 56425254 (fix: updated components.d.ts)
+=======
+    LucideInfo: typeof import('~icons/lucide/info')['default']
+    LucidePlus: typeof import('~icons/lucide/plus')['default']
+    LucideSearch: typeof import('~icons/lucide/search')['default']
+>>>>>>> 4c7269e3 (fix: updated components.d.ts)
     MarkAsDoneIcon: typeof import('./src/components/Icons/MarkAsDoneIcon.vue')['default']
     MaximizeIcon: typeof import('./src/components/Icons/MaximizeIcon.vue')['default']
     MenuIcon: typeof import('./src/components/Icons/MenuIcon.vue')['default']
@@ -202,6 +208,7 @@ declare module 'vue' {
     PlaybackSpeedOption: typeof import('./src/components/Activities/PlaybackSpeedOption.vue')['default']
     PlayIcon: typeof import('./src/components/Icons/PlayIcon.vue')['default']
     Popover: typeof import('./src/components/frappe-ui/Popover.vue')['default']
+    ProfileImageEditor: typeof import('./src/components/Settings/ProfileImageEditor.vue')['default']
     ProfileSettings: typeof import('./src/components/Settings/ProfileSettings.vue')['default']
     QuickEntryModal: typeof import('./src/components/Modals/QuickEntryModal.vue')['default']
     QuickFilterField: typeof import('./src/components/QuickFilterField.vue')['default']

From 7a9172d94b88dccd9bf244ab0d1762aa72f43b42 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 19 Jun 2025 12:56:50 +0530
Subject: [PATCH 29/51] fix: change password validation messsage

(cherry picked from commit 7f1db0b44402a31c1e4b35f76dce34fca6a365cc)
---
 frontend/src/components/Controls/Password.vue | 14 +++-
 .../components/Modals/ChangePasswordModal.vue | 72 +++++++++++++++++--
 frontend/src/components/Settings/Users.vue    |  2 +-
 3 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/Controls/Password.vue b/frontend/src/components/Controls/Password.vue
index 6a636039..f8fd9d78 100644
--- a/frontend/src/components/Controls/Password.vue
+++ b/frontend/src/components/Controls/Password.vue
@@ -3,17 +3,25 @@
     :type="show ? 'text' : 'password'"
     :value="modelValue || value"
     v-bind="$attrs"
+    @keydown.meta.i.prevent="show = !show"
   >
+    <template #prefix v-if="$slots.prefix">
+      <slot name="prefix" />
+    </template>
     <template #suffix>
-      <Button v-show="showEye" class="!h-4" @click="show = !show">
-        <FeatherIcon :name="show ? 'eye-off' : 'eye'" class="h-3" />
-      </Button>
+      <FeatherIcon
+        v-show="showEye"
+        :name="show ? 'eye-off' : 'eye'"
+        class="h-3 cursor-pointer mr-1"
+        @click="show = !show"
+      />
     </template>
   </FormControl>
 </template>
 <script setup>
 import { FormControl } from 'frappe-ui'
 import { ref, computed } from 'vue'
+
 const props = defineProps({
   modelValue: {
     type: [String, Number],
diff --git a/frontend/src/components/Modals/ChangePasswordModal.vue b/frontend/src/components/Modals/ChangePasswordModal.vue
index 72268f44..673864cb 100644
--- a/frontend/src/components/Modals/ChangePasswordModal.vue
+++ b/frontend/src/components/Modals/ChangePasswordModal.vue
@@ -1,12 +1,39 @@
 <template>
   <Dialog v-model="show" :options="{ title: __('Change Password') }">
     <template #body-content>
-      <Password
-        v-model="newPassword"
-        :label="__('New Password')"
-        class="mb-4"
-      />
-      <Password v-model="confirmPassword" :label="__('Confirm Password')" />
+      <div class="flex flex-col gap-4">
+        <div>
+          <Password v-model="newPassword" :placeholder="__('New Password')">
+            <template #prefix>
+              <LockKeyhole class="size-4 text-ink-gray-4" />
+            </template>
+          </Password>
+          <p v-if="newPasswordMessage" class="text-sm text-ink-gray-5 mt-2">
+            {{ newPasswordMessage }}
+          </p>
+        </div>
+        <div>
+          <Password
+            v-model="confirmPassword"
+            :placeholder="__('Confirm Password')"
+          >
+            <template #prefix>
+              <LockKeyhole class="size-4 text-ink-gray-4" />
+            </template>
+          </Password>
+          <p
+            v-if="confirmPasswordMessage"
+            class="text-sm text-ink-gray-5 mt-2"
+            :class="
+              confirmPasswordMessage === 'Passwords match'
+                ? 'text-ink-green-3'
+                : 'text-ink-red-3'
+            "
+          >
+            {{ confirmPasswordMessage }}
+          </p>
+        </div>
+      </div>
     </template>
     <template #actions>
       <div class="flex justify-between items-center">
@@ -27,11 +54,12 @@
   </Dialog>
 </template>
 <script setup>
+import LockKeyhole from '~icons/lucide/lock-keyhole'
 import Password from '@/components/Controls/Password.vue'
 import { usersStore } from '@/stores/users'
 import { Dialog, toast, createResource } from 'frappe-ui'
 import { useOnboarding } from 'frappe-ui/frappe'
-import { ref } from 'vue'
+import { ref, watch } from 'vue'
 
 const show = defineModel()
 
@@ -40,6 +68,8 @@ const { updateOnboardingStep } = useOnboarding('frappecrm')
 
 const newPassword = ref('')
 const confirmPassword = ref('')
+const newPasswordMessage = ref('')
+const confirmPasswordMessage = ref('')
 
 const error = ref('')
 
@@ -65,4 +95,32 @@ const updatePassword = createResource({
     error.value = err.messages[0] || __('Failed to update password')
   },
 })
+
+function isStrongPassword(password) {
+  const regex =
+    /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&])[A-Za-z\d@$!%*?&]{8,}$/
+  return regex.test(password)
+}
+
+watch(newPassword, () => {
+  newPasswordMessage.value = ''
+  if (newPassword.value.length < 8) {
+    newPasswordMessage.value = 'Password must be at least 8 characters'
+  } else if (!isStrongPassword(newPassword.value)) {
+    newPasswordMessage.value =
+      'Password must contain uppercase, lowercase, number, and symbol'
+  }
+})
+
+watch(confirmPassword, () => {
+  confirmPasswordMessage.value = ''
+  if (newPassword.value !== confirmPassword.value) {
+    confirmPasswordMessage.value = 'Passwords do not match'
+  } else if (
+    newPassword.value === confirmPassword.value &&
+    newPassword.value.length
+  ) {
+    confirmPasswordMessage.value = 'Passwords match'
+  }
+})
 </script>
diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index 2361e34d..8d876f45 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -69,7 +69,7 @@
     <!-- Users List -->
     <ul
       v-if="!users.loading && Boolean(users.data?.length)"
-      class="divide-y overflow-auto"
+      class="divide-y divide-outline-gray-modals overflow-auto"
     >
       <li
         class="flex items-center justify-between py-2"

From d98899d9542d60610c5cc31d950030b97fb35113 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 19 Jun 2025 15:07:57 +0530
Subject: [PATCH 30/51] fix: moved change password modal in global modals

(cherry picked from commit dc82f837aa95a4d1dd54e9a42ebfe270bf2260b1)
---
 frontend/src/components/Layouts/AppSidebar.vue       | 4 ++--
 frontend/src/components/Modals/GlobalModals.vue      | 8 +++++++-
 frontend/src/components/Settings/ProfileSettings.vue | 8 +-------
 frontend/src/composables/modals.js                   | 4 +++-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index 3a156e0d..f97b645d 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -172,6 +172,7 @@ import {
 import { usersStore } from '@/stores/users'
 import { sessionStore } from '@/stores/session'
 import { showSettings, activeSettingsPage } from '@/composables/settings'
+import { showChangePasswordModal } from '@/composables/modals'
 import { FeatherIcon, call } from 'frappe-ui'
 import {
   SignupBanner,
@@ -329,8 +330,7 @@ const steps = reactive([
     completed: false,
     onClick: () => {
       minimize.value = true
-      showSettings.value = true
-      activeSettingsPage.value = 'Profile'
+      showChangePasswordModal.value = true
     },
   },
   {
diff --git a/frontend/src/components/Modals/GlobalModals.vue b/frontend/src/components/Modals/GlobalModals.vue
index 310b3d5d..d4328e6c 100644
--- a/frontend/src/components/Modals/GlobalModals.vue
+++ b/frontend/src/components/Modals/GlobalModals.vue
@@ -16,9 +16,14 @@
     v-model="showAddressModal"
     v-bind="addressProps"
   />
+  <ChangePasswordModal
+    v-if="showChangePasswordModal"
+    v-model="showChangePasswordModal"
+  />
   <AboutModal v-model="showAboutModal" />
 </template>
 <script setup>
+import ChangePasswordModal from '@/components/Modals/ChangePasswordModal.vue'
 import CreateDocumentModal from '@/components/Modals/CreateDocumentModal.vue'
 import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue'
 import AddressModal from '@/components/Modals/AddressModal.vue'
@@ -34,6 +39,7 @@ import {
   quickEntryProps,
   showAddressModal,
   addressProps,
-  showAboutModal
+  showAboutModal,
+  showChangePasswordModal,
 } from '@/composables/modals'
 </script>
diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index c28ae63b..7f19029f 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -66,10 +66,6 @@
           icon-left="lock"
           @click="showChangePasswordModal = true"
         />
-        <ChangePasswordModal
-          v-if="showChangePasswordModal"
-          v-model="showChangePasswordModal"
-        />
       </div>
       <div class="flex flex-col gap-4">
         <div class="flex justify-between gap-4">
@@ -102,9 +98,9 @@
 </template>
 <script setup>
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
-import ChangePasswordModal from '@/components/Modals/ChangePasswordModal.vue'
 import { usersStore } from '@/stores/users'
 import { validateIsImageFile } from '@/utils'
+import { showChangePasswordModal } from '@/composables/modals'
 import {
   Dropdown,
   FileUploader,
@@ -118,8 +114,6 @@ const { getUser, users } = usersStore()
 
 const user = computed(() => getUser() || {})
 
-const showChangePasswordModal = ref(false)
-
 const profile = ref({})
 const error = ref('')
 
diff --git a/frontend/src/composables/modals.js b/frontend/src/composables/modals.js
index 4fb354c7..bb7e3986 100644
--- a/frontend/src/composables/modals.js
+++ b/frontend/src/composables/modals.js
@@ -6,4 +6,6 @@ export const quickEntryProps = ref({});
 export const showAddressModal = ref(false);
 export const addressProps = ref({});
 
-export const showAboutModal = ref(false);
\ No newline at end of file
+export const showAboutModal = ref(false);
+
+export const showChangePasswordModal = ref(false);
\ No newline at end of file

From 6abc772281a83d98c7a62d6f0fab4bc42f6aa525 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 19 Jun 2025 15:08:53 +0530
Subject: [PATCH 31/51] fix: added tooltip with shortcut

(cherry picked from commit d951dff5a90d1aa4df28068e93a2407c04dff9b6)
---
 frontend/components.d.ts                      |  1 +
 frontend/src/components/Controls/Password.vue | 36 +++++++++++++++----
 frontend/src/components/KeyboardShortcut.vue  | 33 +++++++++++++++++
 .../components/Modals/ChangePasswordModal.vue | 15 ++++----
 4 files changed, 72 insertions(+), 13 deletions(-)
 create mode 100644 frontend/src/components/KeyboardShortcut.vue

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 3949f767..60081dac 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -142,6 +142,7 @@ declare module 'vue' {
     KanbanIcon: typeof import('./src/components/Icons/KanbanIcon.vue')['default']
     KanbanSettings: typeof import('./src/components/Kanban/KanbanSettings.vue')['default']
     KanbanView: typeof import('./src/components/Kanban/KanbanView.vue')['default']
+    KeyboardShortcut: typeof import('./src/components/KeyboardShortcut.vue')['default']
     LayoutHeader: typeof import('./src/components/LayoutHeader.vue')['default']
     LeadModal: typeof import('./src/components/Modals/LeadModal.vue')['default']
     LeadsIcon: typeof import('./src/components/Icons/LeadsIcon.vue')['default']
diff --git a/frontend/src/components/Controls/Password.vue b/frontend/src/components/Controls/Password.vue
index f8fd9d78..2346fc93 100644
--- a/frontend/src/components/Controls/Password.vue
+++ b/frontend/src/components/Controls/Password.vue
@@ -4,22 +4,44 @@
     :value="modelValue || value"
     v-bind="$attrs"
     @keydown.meta.i.prevent="show = !show"
+    @keydown.ctrl.i.prevent="show = !show"
   >
     <template #prefix v-if="$slots.prefix">
       <slot name="prefix" />
     </template>
     <template #suffix>
-      <FeatherIcon
-        v-show="showEye"
-        :name="show ? 'eye-off' : 'eye'"
-        class="h-3 cursor-pointer mr-1"
-        @click="show = !show"
-      />
+      <Tooltip>
+        <template #body>
+          <div
+            class="rounded bg-surface-gray-7 py-1.5 px-2 text-xs text-ink-white shadow-xl"
+          >
+            <span class="flex items-center gap-1">
+              {{ show ? __('Hide Password') : __('Show Password') }}
+              <KeyboardShortcut
+                bg
+                ctrl
+                class="!bg-surface-gray-5 !text-ink-gray-2 px-1"
+              >
+                <span class="font-mono leading-none tracking-widest">+I</span>
+              </KeyboardShortcut>
+            </span>
+          </div>
+        </template>
+        <div>
+          <FeatherIcon
+            v-show="showEye"
+            :name="show ? 'eye-off' : 'eye'"
+            class="h-3 cursor-pointer mr-1"
+            @click="show = !show"
+          />
+        </div>
+      </Tooltip>
     </template>
   </FormControl>
 </template>
 <script setup>
-import { FormControl } from 'frappe-ui'
+import KeyboardShortcut from '@/components/KeyboardShortcut.vue'
+import { FormControl, Tooltip } from 'frappe-ui'
 import { ref, computed } from 'vue'
 
 const props = defineProps({
diff --git a/frontend/src/components/KeyboardShortcut.vue b/frontend/src/components/KeyboardShortcut.vue
new file mode 100644
index 00000000..5671a239
--- /dev/null
+++ b/frontend/src/components/KeyboardShortcut.vue
@@ -0,0 +1,33 @@
+<template>
+  <div
+    class="inline-flex items-center gap-0.5 text-sm"
+    :class="{
+      'bg-surface-gray-2 rounded-sm text-ink-gray-5 py-0.5 px-1': bg,
+      'text-ink-gray-4': !bg,
+    }"
+  >
+    <span v-if="ctrl || meta">
+      <LucideCommand v-if="isMac" class="w-3 h-3" />
+      <span v-else>Ctrl</span>
+    </span>
+    <span v-if="shift"><LucideShift class="w-3 h-3" /></span>
+    <span v-if="alt"><LucideAlt class="w-3 h-3" /></span>
+    <slot></slot>
+  </div>
+</template>
+<script setup>
+import LucideCommand from '~icons/lucide/command'
+import LucideShift from '~icons/lucide/arrow-big-up'
+import LucideAlt from '~icons/lucide/option'
+
+const isMac = navigator.userAgent.includes('Mac')
+
+defineProps({
+  meta: Boolean,
+  ctrl: Boolean,
+  shift: Boolean,
+  alt: Boolean,
+  shortcut: String,
+  bg: Boolean,
+})
+</script>
diff --git a/frontend/src/components/Modals/ChangePasswordModal.vue b/frontend/src/components/Modals/ChangePasswordModal.vue
index 673864cb..d6c03399 100644
--- a/frontend/src/components/Modals/ChangePasswordModal.vue
+++ b/frontend/src/components/Modals/ChangePasswordModal.vue
@@ -102,23 +102,26 @@ function isStrongPassword(password) {
   return regex.test(password)
 }
 
-watch(newPassword, () => {
+watch([newPassword, confirmPassword], () => {
+  confirmPasswordMessage.value = ''
   newPasswordMessage.value = ''
+
   if (newPassword.value.length < 8) {
     newPasswordMessage.value = 'Password must be at least 8 characters'
   } else if (!isStrongPassword(newPassword.value)) {
     newPasswordMessage.value =
       'Password must contain uppercase, lowercase, number, and symbol'
   }
-})
 
-watch(confirmPassword, () => {
-  confirmPasswordMessage.value = ''
-  if (newPassword.value !== confirmPassword.value) {
+  if (
+    confirmPassword.value.length &&
+    newPassword.value !== confirmPassword.value
+  ) {
     confirmPasswordMessage.value = 'Passwords do not match'
   } else if (
     newPassword.value === confirmPassword.value &&
-    newPassword.value.length
+    newPassword.value.length &&
+    confirmPassword.value.length
   ) {
     confirmPasswordMessage.value = 'Passwords match'
   }

From c3a89c564b47b5fbe800b6e907e00fdda43b0fcf Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 15:50:47 +0530
Subject: [PATCH 32/51] fix: get users and crm users

(cherry picked from commit 001a3231e1342dabf9a611ecc2e79e4a25182943)
---
 crm/api/session.py           | 9 ++++++++-
 frontend/src/stores/users.js | 8 ++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/crm/api/session.py b/crm/api/session.py
index 278f8b5e..add14c37 100644
--- a/crm/api/session.py
+++ b/crm/api/session.py
@@ -44,7 +44,14 @@ def get_users():
 
 		user.is_agent = frappe.db.exists("CRM Telephony Agent", {"user": user.name})
 
-	return users
+	crm_users = []
+
+	# crm users are users with role Sales User or Sales Manager
+	for user in users:
+		if "Sales User" in user.roles or "Sales Manager" in user.roles:
+			crm_users.append(user)
+
+	return users, crm_users
 
 
 @frappe.whitelist()
diff --git a/frontend/src/stores/users.js b/frontend/src/stores/users.js
index 1cf35ca5..3614bda5 100644
--- a/frontend/src/stores/users.js
+++ b/frontend/src/stores/users.js
@@ -12,17 +12,17 @@ export const usersStore = defineStore('crm-users', () => {
 
   const users = createResource({
     url: 'crm.api.session.get_users',
-    cache: 'Users',
+    cache: 'crm-users',
     initialData: [],
     auto: true,
-    transform(users) {
-      for (let user of users) {
+    transform([allUsers, crmUsers]) {
+      for (let user of allUsers) {
         usersByName[user.name] = user
         if (user.name === 'Administrator') {
           usersByName[user.email] = user
         }
       }
-      return users
+      return { allUsers, crmUsers }
     },
     onError(error) {
       if (error && error.exc_type === 'AuthenticationError') {

From 7fbda3ec9c8af782e4c8b4cb6ac3877d31c7f323 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 16:41:08 +0530
Subject: [PATCH 33/51] fix: use crmUsers in comment box

(cherry picked from commit 85191e10c881490ae420156798a320935a9c6fa2)
---
 frontend/src/components/CommentBox.vue        | 2 +-
 frontend/src/components/Settings/Settings.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/CommentBox.vue b/frontend/src/components/CommentBox.vue
index 3fcfc82c..86074750 100644
--- a/frontend/src/components/CommentBox.vue
+++ b/frontend/src/components/CommentBox.vue
@@ -149,7 +149,7 @@ function removeAttachment(attachment) {
 
 const users = computed(() => {
   return (
-    usersList.data
+    usersList.data?.crmUsers
       ?.filter((user) => user.enabled)
       .map((user) => ({
         label: user.full_name.trimEnd(),
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 612e67a2..c81fa5f3 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -60,7 +60,7 @@ import {
   showSettings,
   activeSettingsPage,
 } from '@/composables/settings'
-import { Dialog, Button, Avatar } from 'frappe-ui'
+import { Dialog, Avatar } from 'frappe-ui'
 import { ref, markRaw, computed, watch, h } from 'vue'
 
 const { isManager, isAgent, getUser } = usersStore()

From 1810b31647be8f7caeb1808a820b20ce77eb75ac Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 16:42:45 +0530
Subject: [PATCH 34/51] fix: created multi select user input

(cherry picked from commit f818a4c1d6ee4defeacacfbc39c4ef40309d01b1)
---
 .../Controls/MultiSelectUserInput.vue         | 278 ++++++++++++++++++
 1 file changed, 278 insertions(+)
 create mode 100644 frontend/src/components/Controls/MultiSelectUserInput.vue

diff --git a/frontend/src/components/Controls/MultiSelectUserInput.vue b/frontend/src/components/Controls/MultiSelectUserInput.vue
new file mode 100644
index 00000000..3a554c2e
--- /dev/null
+++ b/frontend/src/components/Controls/MultiSelectUserInput.vue
@@ -0,0 +1,278 @@
+<template>
+  <div>
+    <div class="flex flex-wrap gap-1">
+      <Button
+        ref="emails"
+        v-for="value in values"
+        :key="value"
+        :label="value"
+        theme="gray"
+        variant="subtle"
+        :class="{
+          'rounded bg-surface-white hover:!bg-surface-gray-1 focus-visible:ring-outline-gray-4':
+            variant === 'subtle',
+        }"
+        @keydown.delete.capture.stop="removeLastValue"
+      >
+        <template #suffix>
+          <FeatherIcon
+            class="h-3.5"
+            name="x"
+            @click.stop="removeValue(value)"
+          />
+        </template>
+      </Button>
+      <div class="flex-1">
+        <Combobox v-model="selectedValue" nullable>
+          <Popover class="w-full" v-model:show="showOptions">
+            <template #target="{ togglePopover }">
+              <ComboboxInput
+                ref="search"
+                class="search-input form-input w-full border-none focus:border-none focus:!shadow-none focus-visible:!ring-0"
+                :class="[
+                  variant == 'ghost'
+                    ? 'bg-surface-white hover:bg-surface-white'
+                    : 'bg-surface-gray-2 hover:bg-surface-gray-3',
+                  inputClass,
+                ]"
+                :placeholder="placeholder"
+                type="text"
+                :value="query"
+                @change="
+                  (e) => {
+                    query = e.target.value
+                    showOptions = true
+                  }
+                "
+                autocomplete="off"
+                @focus="() => togglePopover()"
+                @keydown.delete.capture.stop="removeLastValue"
+              />
+            </template>
+            <template #body="{ isOpen }">
+              <div v-show="isOpen">
+                <div
+                  class="mt-1 rounded-lg bg-surface-modal shadow-2xl ring-1 ring-black ring-opacity-5 focus:outline-none"
+                >
+                  <ComboboxOptions
+                    class="p-1.5 max-h-[12rem] overflow-y-auto"
+                    static
+                  >
+                    <div
+                      v-if="!options.length"
+                      class="flex gap-2 rounded px-2 py-1 text-base text-ink-gray-5"
+                    >
+                      <FeatherIcon
+                        v-if="fetchUsers"
+                        name="search"
+                        class="h-4"
+                      />
+                      {{
+                        fetchUsers
+                          ? __('No results found')
+                          : __('Type an email address to invite')
+                      }}
+                    </div>
+                    <ComboboxOption
+                      v-for="option in options"
+                      :key="option.value"
+                      :value="option"
+                      v-slot="{ active }"
+                    >
+                      <li
+                        :class="[
+                          'flex cursor-pointer items-center rounded px-2 py-1 text-base',
+                          { 'bg-surface-gray-3': active },
+                        ]"
+                      >
+                        <UserAvatar
+                          class="mr-2"
+                          :user="option.value"
+                          size="lg"
+                        />
+                        <div class="flex flex-col gap-1 p-1 text-ink-gray-8">
+                          <div class="text-base font-medium">
+                            {{ option.label }}
+                          </div>
+                          <div class="text-sm text-ink-gray-5">
+                            {{ option.value }}
+                          </div>
+                        </div>
+                      </li>
+                    </ComboboxOption>
+                  </ComboboxOptions>
+                </div>
+              </div>
+            </template>
+          </Popover>
+        </Combobox>
+      </div>
+    </div>
+    <ErrorMessage class="mt-2 pl-2" v-if="error" :message="error" />
+    <div
+      v-if="info"
+      class="whitespace-pre-line text-sm text-ink-blue-3 mt-2 pl-2"
+    >
+      {{ info }}
+    </div>
+  </div>
+</template>
+
+<script setup>
+import {
+  Combobox,
+  ComboboxInput,
+  ComboboxOptions,
+  ComboboxOption,
+} from '@headlessui/vue'
+import UserAvatar from '@/components/UserAvatar.vue'
+import Popover from '@/components/frappe-ui/Popover.vue'
+import { usersStore } from '@/stores/users'
+import { ref, computed, nextTick } from 'vue'
+
+const props = defineProps({
+  validate: {
+    type: Function,
+    default: null,
+  },
+  variant: {
+    type: String,
+    default: 'subtle',
+  },
+  placeholder: {
+    type: String,
+    default: '',
+  },
+  inputClass: {
+    type: String,
+    default: '',
+  },
+  errorMessage: {
+    type: Function,
+    default: (value) => `${value} is an Invalid value`,
+  },
+  fetchUsers: {
+    type: Boolean,
+    default: true,
+  },
+  existingEmails: {
+    type: Array,
+    default: () => [],
+  },
+})
+
+const values = defineModel()
+
+const { users } = usersStore()
+
+const emails = ref([])
+const search = ref(null)
+const error = ref(null)
+const info = ref(null)
+const query = ref('')
+const showOptions = ref(false)
+
+const selectedValue = computed({
+  get: () => query.value || '',
+  set: (val) => {
+    query.value = ''
+    if (val) {
+      showOptions.value = false
+    }
+    val?.value && addValue(val.value)
+  },
+})
+
+const options = computed(() => {
+  let userEmails = props.fetchUsers ? users?.data?.allUsers : []
+
+  if (props.fetchUsers) {
+    userEmails = userEmails.map((user) => ({
+      label: user.full_name || user.name || user.email,
+      value: user.email,
+    }))
+
+    if (props.existingEmails?.length) {
+      userEmails = userEmails.filter((option) => {
+        return !props.existingEmails.includes(option.value)
+      })
+    }
+
+    if (query.value) {
+      userEmails = userEmails.filter(
+        (option) =>
+          option.label.toLowerCase().includes(query.value.toLowerCase()) ||
+          option.value.toLowerCase().includes(query.value.toLowerCase()),
+      )
+    }
+  } else if (!userEmails?.length && query.value) {
+    userEmails.push({
+      label: query.value,
+      value: query.value,
+    })
+  }
+
+  return userEmails || []
+})
+
+const addValue = (value) => {
+  error.value = null
+  info.value = null
+  if (value) {
+    const splitValues = value.split(',')
+    splitValues.forEach((value) => {
+      value = value.trim()
+      if (value) {
+        // check if value is not already in the values array
+        if (!values.value?.includes(value)) {
+          // check if value is valid
+          if (value && props.validate && !props.validate(value)) {
+            error.value = props.errorMessage(value)
+            query.value = value
+            return
+          }
+          // add value to values array
+          if (!values.value) {
+            values.value = [value]
+          } else {
+            values.value.push(value)
+          }
+          value = value.replace(value, '')
+        } else {
+          info.value = __('email already exists')
+        }
+      }
+    })
+    !error.value && (value = '')
+  }
+}
+
+const removeValue = (value) => {
+  values.value = values.value.filter((v) => v !== value)
+}
+
+const removeLastValue = () => {
+  if (query.value) return
+
+  let emailRef = emails.value[emails.value.length - 1]?.$el
+  if (document.activeElement === emailRef) {
+    values.value.pop()
+    nextTick(() => {
+      if (values.value.length) {
+        emailRef = emails.value[emails.value.length - 1].$el
+        emailRef?.focus()
+      } else {
+        setFocus()
+      }
+    })
+  } else {
+    emailRef?.focus()
+  }
+}
+
+function setFocus() {
+  search.value.$el.focus()
+}
+
+defineExpose({ setFocus })
+</script>

From ffd24933cd6e104bc2de7754edf8b2630c9e2db5 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 16:43:48 +0530
Subject: [PATCH 35/51] fix: use multi select user input and show already exist
 error if user with email exist or invited

(cherry picked from commit d06ac91052021be38952d9956e418ff868c11af5)
---
 .../components/Settings/InviteUserPage.vue    | 46 +++++++++++++++++--
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Settings/InviteUserPage.vue b/frontend/src/components/Settings/InviteUserPage.vue
index 077668ed..77ce8211 100644
--- a/frontend/src/components/Settings/InviteUserPage.vue
+++ b/frontend/src/components/Settings/InviteUserPage.vue
@@ -11,7 +11,7 @@
         <div
           class="p-2 group bg-surface-gray-2 hover:bg-surface-gray-3 rounded"
         >
-          <MultiSelectEmailInput
+          <MultiSelectUserInput
             class="flex-1"
             inputClass="!bg-surface-gray-2 hover:!bg-surface-gray-3 group-hover:!bg-surface-gray-3"
             :placeholder="__('john@doe.com')"
@@ -20,9 +20,15 @@
             :error-message="
               (value) => __('{0} is an invalid email address', [value])
             "
-            :fetchContacts="false"
+            :fetchUsers="false"
           />
         </div>
+        <div
+          v-if="userExistMessage || inviteeExistMessage"
+          class="text-xs text-ink-red-3 mt-1.5"
+        >
+          {{ userExistMessage || inviteeExistMessage }}
+        </div>
         <FormControl
           type="select"
           class="mt-4"
@@ -86,7 +92,7 @@
   </div>
 </template>
 <script setup>
-import MultiSelectEmailInput from '@/components/Controls/MultiSelectEmailInput.vue'
+import MultiSelectUserInput from '@/components/Controls/MultiSelectUserInput.vue'
 import { validateEmail, convertArrayToString } from '@/utils'
 import { usersStore } from '@/stores/users'
 import {
@@ -99,12 +105,44 @@ import { useOnboarding } from 'frappe-ui/frappe'
 import { ref, computed } from 'vue'
 
 const { updateOnboardingStep } = useOnboarding('frappecrm')
-const { isAdmin, isManager } = usersStore()
+const { users, isAdmin, isManager } = usersStore()
 
 const invitees = ref([])
 const role = ref('Sales User')
 const error = ref(null)
 
+const userExistMessage = computed(() => {
+  const inviteesSet = new Set(invitees.value)
+  if (!inviteesSet.size) return null
+
+  if (!users.data?.crmUsers?.length) return null
+  const existingEmails = users.data.crmUsers.map((user) => user.name)
+  const existingUsersSet = new Set(existingEmails)
+
+  const existingInvitees = inviteesSet.intersection(existingUsersSet)
+  if (existingInvitees.size === 0) return null
+
+  return __('User with email {0} already exists', [
+    Array.from(existingInvitees).join(', '),
+  ])
+})
+
+const inviteeExistMessage = computed(() => {
+  const inviteesSet = new Set(invitees.value)
+  if (!inviteesSet.size) return null
+
+  if (!pendingInvitations.data?.length) return null
+  const existingEmails = pendingInvitations.data.map((user) => user.email)
+  const existingUsersSet = new Set(existingEmails)
+
+  const existingInvitees = inviteesSet.intersection(existingUsersSet)
+  if (existingInvitees.size === 0) return null
+
+  return __('User with email {0} already invited', [
+    Array.from(existingInvitees).join(', '),
+  ])
+})
+
 const description = computed(() => {
   return {
     'System Manager':

From e3cd12630402f74a9beb02205c09bd4e1e4706fe Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 16:45:48 +0530
Subject: [PATCH 36/51] fix: removed CRM User doctype and moved api's to
 user.py

(cherry picked from commit 901bcb84602eb2a0a1ac7bcdf1743107cbeb301f)
---
 crm/api/user.py                            |  85 ++++++++++++++++
 crm/fcrm/doctype/crm_user/__init__.py      |   0
 crm/fcrm/doctype/crm_user/crm_user.js      |   8 --
 crm/fcrm/doctype/crm_user/crm_user.json    | 112 ---------------------
 crm/fcrm/doctype/crm_user/crm_user.py      |  80 ---------------
 crm/fcrm/doctype/crm_user/test_crm_user.py |  29 ------
 frontend/components.d.ts                   |   1 +
 7 files changed, 86 insertions(+), 229 deletions(-)
 create mode 100644 crm/api/user.py
 delete mode 100644 crm/fcrm/doctype/crm_user/__init__.py
 delete mode 100644 crm/fcrm/doctype/crm_user/crm_user.js
 delete mode 100644 crm/fcrm/doctype/crm_user/crm_user.json
 delete mode 100644 crm/fcrm/doctype/crm_user/crm_user.py
 delete mode 100644 crm/fcrm/doctype/crm_user/test_crm_user.py

diff --git a/crm/api/user.py b/crm/api/user.py
new file mode 100644
index 00000000..ab20fbda
--- /dev/null
+++ b/crm/api/user.py
@@ -0,0 +1,85 @@
+import frappe
+
+
+@frappe.whitelist()
+def add_existing_users(users, role="Sales User"):
+	"""
+	Add existing users to the CRM User doctype.
+	:param users: List of user names to be added
+	"""
+	frappe.only_for(["System Manager", "Sales Manager"])
+	users = frappe.parse_json(users)
+
+	for user in users:
+		add_user(user, role)
+
+
+@frappe.whitelist()
+def update_user_role(user, new_role):
+	"""
+	Update the role of the user to Sales Manager, Sales User, or System Manager.
+	:param user: The name of the user
+	:param new_role: The new role to assign (Sales Manager or Sales User)
+	"""
+
+	frappe.only_for(["System Manager", "Sales Manager"])
+
+	if new_role not in ["System Manager", "Sales Manager", "Sales User"]:
+		frappe.throw("Cannot assign this role")
+
+	user_doc = frappe.get_doc("User", user)
+
+	if new_role == "System Manager":
+		user_doc.append_roles("System Manager", "Sales Manager", "Sales User")
+	if new_role == "Sales Manager":
+		user_doc.append_roles("Sales Manager", "Sales User")
+		user_doc.remove_roles("System Manager")
+	if new_role == "Sales User":
+		user_doc.append_roles("Sales User")
+		user_doc.remove_roles("Sales Manager", "System Manager")
+
+	user_doc.save()
+
+
+@frappe.whitelist()
+def add_user(user, role):
+	"""
+	Add a user means adding role (Sales User or/and Sales Manager) to the user.
+	:param user: The name of the user to be added
+	:param role: The role to be assigned (Sales User or Sales Manager)
+	"""
+	frappe.only_for(["System Manager", "Sales Manager"])
+
+	if role not in ["System Manager", "Sales Manager", "Sales User"]:
+		frappe.throw("Cannot assign this role")
+
+	user_doc = frappe.get_doc("User", user)
+
+	if role == "System Manager":
+		user_doc.append_roles("System Manager", "Sales Manager", "Sales User")
+	elif role == "Sales Manager":
+		user_doc.append_roles("Sales Manager", "Sales User")
+	elif role == "Sales User":
+		user_doc.append_roles("Sales User")
+
+	user_doc.save()
+
+
+@frappe.whitelist()
+def remove_user(user):
+	"""
+	Remove a user means removing Sales User & Sales Manager roles from the user.
+	:param user: The name of the user to be removed
+	"""
+	frappe.only_for(["System Manager", "Sales Manager"])
+
+	user_doc = frappe.get_doc("User", user)
+	roles = [d.role for d in user_doc.roles]
+
+	if "Sales User" in roles:
+		user_doc.remove_roles("Sales User")
+	if "Sales Manager" in roles:
+		user_doc.remove_roles("Sales Manager")
+
+	user_doc.save()
+	frappe.msgprint(f"User {user} has been removed from CRM roles.")
diff --git a/crm/fcrm/doctype/crm_user/__init__.py b/crm/fcrm/doctype/crm_user/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/crm/fcrm/doctype/crm_user/crm_user.js b/crm/fcrm/doctype/crm_user/crm_user.js
deleted file mode 100644
index 71b91b59..00000000
--- a/crm/fcrm/doctype/crm_user/crm_user.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-// frappe.ui.form.on("CRM User", {
-// 	refresh(frm) {
-
-// 	},
-// });
diff --git a/crm/fcrm/doctype/crm_user/crm_user.json b/crm/fcrm/doctype/crm_user/crm_user.json
deleted file mode 100644
index 1f7f119c..00000000
--- a/crm/fcrm/doctype/crm_user/crm_user.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "autoname": "field:user",
- "creation": "2025-05-21 12:59:26.007215",
- "doctype": "DocType",
- "engine": "InnoDB",
- "field_order": [
-  "user",
-  "is_active",
-  "section_break_qdxc",
-  "first_name",
-  "middle_name",
-  "last_name",
-  "column_break_kpoq",
-  "user_name",
-  "image"
- ],
- "fields": [
-  {
-   "fieldname": "user",
-   "fieldtype": "Link",
-   "label": "User",
-   "options": "User",
-   "unique": 1
-  },
-  {
-   "default": "1",
-   "fieldname": "is_active",
-   "fieldtype": "Check",
-   "label": "Is Active"
-  },
-  {
-   "fieldname": "section_break_qdxc",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "column_break_kpoq",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "image",
-   "fieldtype": "Attach Image",
-   "label": "Image"
-  },
-  {
-   "fetch_from": "user.first_name",
-   "fetch_if_empty": 1,
-   "fieldname": "first_name",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "First Name",
-   "reqd": 1
-  },
-  {
-   "fieldname": "middle_name",
-   "fieldtype": "Data",
-   "label": "Middle Name"
-  },
-  {
-   "fieldname": "last_name",
-   "fieldtype": "Data",
-   "label": "Last Name"
-  },
-  {
-   "fieldname": "user_name",
-   "fieldtype": "Data",
-   "label": "Full Name"
-  }
- ],
- "grid_page_length": 50,
- "image_field": "image",
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2025-06-17 23:17:19.996659",
- "modified_by": "Administrator",
- "module": "FCRM",
- "name": "CRM User",
- "naming_rule": "By fieldname",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "row_format": "Dynamic",
- "sort_field": "creation",
- "sort_order": "DESC",
- "states": [],
- "title_field": "user_name"
-}
diff --git a/crm/fcrm/doctype/crm_user/crm_user.py b/crm/fcrm/doctype/crm_user/crm_user.py
deleted file mode 100644
index 2bc585a8..00000000
--- a/crm/fcrm/doctype/crm_user/crm_user.py
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
-# For license information, please see license.txt
-
-import frappe
-from frappe.model.document import Document
-
-
-class CRMUser(Document):
-	def validate(self):
-		if self.user:
-			user = frappe.get_doc("User", self.user)
-			if not self.first_name:
-				self.first_name = user.first_name
-			if not self.middle_name:
-				self.middle_name = user.middle_name
-			if not self.last_name:
-				self.last_name = user.last_name
-			if not self.user_name:
-				self.user_name = user.full_name
-			if not self.image:
-				self.image = user.user_image
-
-
-@frappe.whitelist()
-def add_existing_users(users, role='Sales User'):
-	"""
-	Add existing users to the CRM User doctype.
-	:param users: List of user names to be added
-	"""
-	frappe.only_for(["System Manager", "Sales Manager"])
-	users = frappe.parse_json(users)
-
-	for user in users:
-		if not frappe.db.exists("CRM User", {"user": user}):
-			new_user = frappe.new_doc("CRM User")
-			new_user.user = user
-			new_user.save(ignore_permissions=True)
-
-			update_user_role(user, role)
-		else:
-			frappe.throw(f"User {user} already exists")
-
-
-@frappe.whitelist()
-def update_user_role(user, new_role):
-	"""
-	Update the role of the user to Sales Manager, Sales User, or System Manager.
-	:param user: The name of the user
-	:param new_role: The new role to assign (Sales Manager or Sales User)
-	"""
-
-	frappe.only_for(["System Manager", "Sales Manager"])
-
-	if new_role not in ["System Manager", "Sales Manager", "Sales User"]:
-		frappe.throw("Cannot assign this role")
-
-	user_doc = frappe.get_doc("User", user)
-
-	if new_role == "System Manager":
-		user_doc.append_roles("System Manager")
-	if new_role == "Sales Manager":
-		user_doc.append_roles("Sales Manager")
-		user_doc.remove_roles("System Manager")
-	if new_role == "Sales User":
-		user_doc.append_roles("Sales User")
-		user_doc.remove_roles("Sales Manager", "System Manager")
-
-	user_doc.save()
-
-
-@frappe.whitelist()
-def update_user_status(user, status):
-	"""
-	Activate or deactivate the user
-	:param user: The name of the user
-	:param status: The status to set (1 for active, 0 for inactive)
-	"""
-	frappe.only_for(["System Manager", "Sales Manager"])
-
-	frappe.db.set_value("CRM User", user, "is_active", status)
diff --git a/crm/fcrm/doctype/crm_user/test_crm_user.py b/crm/fcrm/doctype/crm_user/test_crm_user.py
deleted file mode 100644
index f368fa88..00000000
--- a/crm/fcrm/doctype/crm_user/test_crm_user.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests import IntegrationTestCase, UnitTestCase
-
-# On IntegrationTestCase, the doctype test records and all
-# link-field test record dependencies are recursively loaded
-# Use these module variables to add/remove to/from that list
-EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
-
-
-class UnitTestCRMUser(UnitTestCase):
-	"""
-	Unit tests for CRMUser.
-	Use this class for testing individual functions and methods.
-	"""
-
-	pass
-
-
-class IntegrationTestCRMUser(IntegrationTestCase):
-	"""
-	Integration tests for CRMUser.
-	Use this class for testing interactions between multiple components.
-	"""
-
-	pass
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 60081dac..cd05f733 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -190,6 +190,7 @@ declare module 'vue' {
     MultiActionButton: typeof import('./src/components/MultiActionButton.vue')['default']
     MultipleAvatar: typeof import('./src/components/MultipleAvatar.vue')['default']
     MultiSelectEmailInput: typeof import('./src/components/Controls/MultiSelectEmailInput.vue')['default']
+    MultiSelectUserInput: typeof import('./src/components/Controls/MultiSelectUserInput.vue')['default']
     MuteIcon: typeof import('./src/components/Icons/MuteIcon.vue')['default']
     NestedPopover: typeof import('./src/components/NestedPopover.vue')['default']
     NoteArea: typeof import('./src/components/Activities/NoteArea.vue')['default']

From 1b30b3ebec534d9b6de01ae023a016e504d20b55 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 16:46:41 +0530
Subject: [PATCH 37/51] fix: updated users page to update user directly and
 removed unnecessary code

(cherry picked from commit 364c369199c4204962a55c58bc0980d3942e3e8b)
---
 .../Modals/AddExistingUserModal.vue           |  20 +-
 frontend/src/components/Settings/Users.vue    | 258 ++++++------------
 2 files changed, 95 insertions(+), 183 deletions(-)

diff --git a/frontend/src/components/Modals/AddExistingUserModal.vue b/frontend/src/components/Modals/AddExistingUserModal.vue
index d196946f..3970436c 100644
--- a/frontend/src/components/Modals/AddExistingUserModal.vue
+++ b/frontend/src/components/Modals/AddExistingUserModal.vue
@@ -21,13 +21,16 @@
       </label>
 
       <div class="p-2 group bg-surface-gray-2 hover:bg-surface-gray-3 rounded">
-        <MultiSelectEmailInput
+        <MultiSelectUserInput
+          v-if="users?.data?.crmUsers.length"
           class="flex-1"
           inputClass="!bg-surface-gray-2 hover:!bg-surface-gray-3 group-hover:!bg-surface-gray-3"
           :placeholder="__('john@doe.com')"
           v-model="newUsers"
           :validate="validateEmail"
-          :existingEmails="props.users.data.map((user) => user.name)"
+          :existingEmails="
+            users.data.crmUsers.map((user) => user.name) + ['admin@example.com']
+          "
           :error-message="
             (value) => __('{0} is an invalid email address', [value])
           "
@@ -57,20 +60,16 @@
 </template>
 
 <script setup>
-import MultiSelectEmailInput from '@/components/Controls/MultiSelectEmailInput.vue'
+import MultiSelectUserInput from '@/components/Controls/MultiSelectUserInput.vue'
 import { validateEmail } from '@/utils'
 import { usersStore } from '@/stores/users'
 import { createResource, toast } from 'frappe-ui'
 import { ref, computed } from 'vue'
 
-const { users: usersResource, isAdmin, isManager } = usersStore()
+const { users, isAdmin, isManager } = usersStore()
 
 const show = defineModel()
 
-const props = defineProps({
-  users: Object,
-})
-
 const newUsers = ref([])
 const role = ref('Sales User')
 
@@ -94,7 +93,7 @@ const roleOptions = computed(() => {
 })
 
 const addNewUser = createResource({
-  url: 'crm.fcrm.doctype.crm_user.crm_user.add_existing_users',
+  url: 'crm.api.user.add_existing_users',
   makeParams: () => ({
     users: JSON.stringify(newUsers.value),
     role: role.value,
@@ -103,8 +102,7 @@ const addNewUser = createResource({
     toast.success(__('Users added successfully'))
     newUsers.value = []
     show.value = false
-    usersResource.reload()
-    props.users.list.reload()
+    users.reload()
   },
   onError: (error) => {
     toast.error(error.messages[0] || __('Failed to add users'))
diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index 8d876f45..d7c29e8a 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -1,32 +1,20 @@
 <template>
-  <div class="flex h-full flex-col gap-8 p-8 text-ink-gray-9">
+  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-9">
     <!-- Header -->
-    <div class="flex items-center justify-between">
-      <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
-        {{ __('Users') }}
-      </h2>
-      <div class="flex item-center space-x-2">
-        <FormControl
-          v-model="search"
-          :placeholder="'Search'"
-          type="text"
-          :debounce="300"
-        >
-          <template #prefix>
-            <LucideSearch class="h-4 w-4 text-ink-gray-4" />
-          </template>
-        </FormControl>
-        <FormControl
-          type="select"
-          :value="currentStatus"
-          :options="[
-            { label: __('All'), value: 'All' },
-            { label: __('Active'), value: 'Active' },
-            { label: __('Inactive'), value: 'Inactive' },
-          ]"
-          @change="(e) => changeStatus(e.target.value)"
-        >
-        </FormControl>
+    <div class="flex justify-between">
+      <div class="flex flex-col gap-1 w-9/12">
+        <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
+          {{ __('Users') }}
+        </h2>
+        <p class="text-p-base text-ink-gray-6">
+          {{
+            __(
+              'Manage users who can access CRM. Assign roles to control their access. Add/Remove existing users or invite new ones.',
+            )
+          }}
+        </p>
+      </div>
+      <div class="flex item-center space-x-2 w-3/12 justify-end">
         <Dropdown
           :options="[
             {
@@ -48,70 +36,50 @@
       </div>
     </div>
 
-    <!-- loading state -->
-    <div v-if="users.loading" class="flex mt-28 justify-between w-full h-full">
-      <Button
-        :loading="users.loading"
-        variant="ghost"
-        class="w-full"
-        size="2xl"
-      />
-    </div>
-    <!-- Empty State -->
-    <div
-      v-if="!users.loading && !users.data?.length"
-      class="flex mt-28 justify-between w-full h-full"
-    >
-      <p class="text-sm text-gray-500 w-full flex justify-center">
-        {{ __('No users found') }}
-      </p>
-    </div>
     <!-- Users List -->
     <ul
-      v-if="!users.loading && Boolean(users.data?.length)"
+      v-if="!users.loading && Boolean(users.data?.crmUsers?.length)"
       class="divide-y divide-outline-gray-modals overflow-auto"
     >
-      <li
-        class="flex items-center justify-between py-2"
-        v-for="user in users.data"
-        :key="user.name"
-      >
-        <div class="flex items-center">
-          <Avatar :image="user.image" :label="user.user_name" size="xl" />
-          <div class="flex flex-col gap-1 ml-3">
-            <div class="flex items-center gap-2 text-base text-ink-gray-9 h-4">
-              {{ user.user_name }}
-              <Badge
-                v-if="!user.is_active"
-                variant="subtle"
-                theme="gray"
-                size="sm"
-                label="Inactive"
-              />
-            </div>
-            <div class="text-base text-ink-gray-5">
-              {{ user.name }}
+      <template v-for="user in users.data?.crmUsers" :key="user.name">
+        <li
+          v-if="user.name !== 'Administrator'"
+          class="flex items-center justify-between py-2"
+        >
+          <div class="flex items-center">
+            <Avatar
+              :image="user.user_image"
+              :label="user.full_name"
+              size="xl"
+            />
+            <div class="flex flex-col gap-1 ml-3">
+              <div class="flex items-center text-base text-ink-gray-9 h-4">
+                {{ user.full_name }}
+              </div>
+              <div class="text-base text-ink-gray-5">
+                {{ user.name }}
+              </div>
             </div>
           </div>
-        </div>
-        <div class="flex gap-2 items-center flex-row-reverse">
-          <Dropdown
-            :options="getMoreOptions(user)"
-            :button="{
-              icon: 'more-horizontal',
-            }"
-            placement="right"
-          />
-          <Dropdown
-            :options="getDropdownOptions(user)"
-            :button="{
-              label: roleMap[getUserRole(user.name)],
-              iconRight: 'chevron-down',
-            }"
-            placement="right"
-          />
-        </div>
-      </li>
+          <div class="flex gap-2 items-center flex-row-reverse">
+            <Dropdown
+              :options="getMoreOptions(user)"
+              :button="{
+                icon: 'more-horizontal',
+              }"
+              placement="right"
+            />
+            <Dropdown
+              :options="getDropdownOptions(user)"
+              :button="{
+                label: roleMap[getUserRole(user.name)],
+                iconRight: 'chevron-down',
+              }"
+              placement="right"
+            />
+          </div>
+        </li>
+      </template>
       <!-- Load More Button -->
       <div
         v-if="!users.loading && users.hasNextPage"
@@ -126,11 +94,30 @@
         />
       </div>
     </ul>
+
+    <!-- loading state -->
+    <div v-if="users.loading" class="flex mt-28 justify-between w-full h-full">
+      <Button
+        :loading="users.loading"
+        variant="ghost"
+        class="w-full"
+        size="2xl"
+      />
+    </div>
+
+    <!-- Empty State -->
+    <div
+      v-if="!users.loading && !users.data?.crmUsers?.length"
+      class="flex mt-28 justify-between w-full h-full"
+    >
+      <p class="text-sm text-gray-500 w-full flex justify-center">
+        {{ __('No users found') }}
+      </p>
+    </div>
   </div>
   <AddExistingUserModal
     v-if="showAddExistingModal"
     v-model="showAddExistingModal"
-    :users="users"
   />
 </template>
 
@@ -139,31 +126,13 @@ import LucideCheck from '~icons/lucide/check'
 import AddExistingUserModal from '@/components/Modals/AddExistingUserModal.vue'
 import { activeSettingsPage } from '@/composables/settings'
 import { usersStore } from '@/stores/users'
-import {
-  Avatar,
-  Badge,
-  createListResource,
-  FormControl,
-  toast,
-  call,
-} from 'frappe-ui'
-import { ref, h, watch, onMounted } from 'vue'
+import { Avatar, toast, call } from 'frappe-ui'
+import { ref, h } from 'vue'
 
-const { users: usersResource, getUserRole, isAdmin, isManager } = usersStore()
+const { users, getUserRole, isAdmin, isManager } = usersStore()
 
 const showAddExistingModal = ref(false)
 
-const users = createListResource({
-  doctype: 'CRM User',
-  cache: 'CRM Users',
-  fields: ['name', 'image', 'is_active', 'user_name'],
-  filters: { is_active: ['=', 1] },
-  auto: true,
-  start: 0,
-  pageLength: 20,
-  orderBy: 'creation desc',
-})
-
 const roleMap = {
   'System Manager': __('Admin'),
   'Sales Manager': __('Manager'),
@@ -173,20 +142,13 @@ const roleMap = {
 function getMoreOptions(user) {
   let options = [
     {
-      label: __('Activate'),
-      icon: 'check-circle',
-      onClick: () => updateStatus(user, true),
-      condition: () => !user.is_active,
-    },
-    {
-      label: __('Deactivate'),
-      icon: 'x-circle',
-      onClick: () => updateStatus(user, false),
-      condition: () => user.is_active,
+      label: __('Remove'),
+      icon: 'trash-2',
+      onClick: () => removeUser(user, true),
     },
   ]
 
-  return options.filter((option) => option.condition())
+  return options.filter((option) => option.condition?.() || true)
 }
 
 function getDropdownOptions(user) {
@@ -252,73 +214,25 @@ function RoleOption({ active, role, onClick, selected }) {
 }
 
 function updateRole(user, newRole) {
-  const currentRole = getUserRole(user.name)
-  if (currentRole === newRole) return
+  if (user.role === newRole) return
 
-  call('crm.fcrm.doctype.crm_user.crm_user.update_user_role', {
+  call('crm.api.user.update_user_role', {
     user: user.name,
     new_role: newRole,
   }).then(() => {
     toast.success(
-      __('{0} has been granted {1} access', [user.user_name, roleMap[newRole]]),
+      __('{0} has been granted {1} access', [user.full_name, roleMap[newRole]]),
     )
-    usersResource.reload()
     users.reload()
   })
 }
 
-function updateStatus(user, status) {
-  const currentStatus = user.is_active
-  if (currentStatus === status) return
-
-  call('crm.fcrm.doctype.crm_user.crm_user.update_user_status', {
+function removeUser(user) {
+  call('crm.api.user.remove_user', {
     user: user.name,
-    status,
   }).then(() => {
-    toast.success(
-      __('{0} has been {1}', [
-        user.user_name,
-        status ? 'activated' : 'deactivated',
-      ]),
-    )
+    toast.success(__('User {0} has been removed', [user.full_name]))
     users.reload()
   })
 }
-
-const currentStatus = ref('Active')
-
-function changeStatus(status) {
-  currentStatus.value = status
-  updateFilters()
-}
-
-function updateFilters() {
-  const status = currentStatus.value || 'Active'
-
-  users.filters = {}
-  if (status === 'Active') {
-    users.filters.is_active = ['=', 1]
-  } else if (status === 'Inactive') {
-    users.filters.is_active = ['=', 0]
-  }
-  users.reload()
-}
-
-onMounted(() => updateFilters())
-
-const search = ref('')
-watch(search, (newValue) => {
-  users.filters = {
-    is_active: ['=', 1],
-    user_name: ['like', `%${newValue}%`],
-  }
-  if (!newValue) {
-    users.filters = {
-      is_active: ['=', 1],
-    }
-    users.start = 0
-    users.pageLength = 10
-  }
-  users.reload()
-})
 </script>

From c8d165593a45d5ee19011db74feb2ee896b72e96 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 17:18:36 +0530
Subject: [PATCH 38/51] fix: existingEmail is a list

(cherry picked from commit 0f8d484e282a2773c23ca927d3e39d7d9d87707b)
---
 frontend/src/components/Modals/AddExistingUserModal.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Modals/AddExistingUserModal.vue b/frontend/src/components/Modals/AddExistingUserModal.vue
index 3970436c..db6b2d4d 100644
--- a/frontend/src/components/Modals/AddExistingUserModal.vue
+++ b/frontend/src/components/Modals/AddExistingUserModal.vue
@@ -28,9 +28,10 @@
           :placeholder="__('john@doe.com')"
           v-model="newUsers"
           :validate="validateEmail"
-          :existingEmails="
-            users.data.crmUsers.map((user) => user.name) + ['admin@example.com']
-          "
+          :existingEmails="[
+            ...users.data.crmUsers.map((user) => user.name),
+            'admin@example.com',
+          ]"
           :error-message="
             (value) => __('{0} is an invalid email address', [value])
           "

From e267445a80254f07c80ca363d55d8034caeae4af Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 17:20:12 +0530
Subject: [PATCH 39/51] fix: layout change

(cherry picked from commit 0ad65be961ff70f069be78979004820d827a96d0)
---
 .../components/Settings/EmailAccountList.vue  | 37 ++++++++-----
 .../components/Settings/GeneralSettings.vue   | 47 +++++++++-------
 .../components/Settings/InviteUserPage.vue    | 39 +++++++++-----
 .../src/components/Settings/SettingsPage.vue  | 48 +++++++++--------
 .../components/Settings/TelephonySettings.vue | 54 ++++++++++---------
 frontend/src/components/Settings/Users.vue    |  2 +-
 6 files changed, 129 insertions(+), 98 deletions(-)

diff --git a/frontend/src/components/Settings/EmailAccountList.vue b/frontend/src/components/Settings/EmailAccountList.vue
index fe5fe222..192ee910 100644
--- a/frontend/src/components/Settings/EmailAccountList.vue
+++ b/frontend/src/components/Settings/EmailAccountList.vue
@@ -1,21 +1,30 @@
 <template>
   <div>
     <!-- header -->
-    <div class="flex items-center justify-between text-ink-gray-9">
-      <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
-        {{ __('Email Accounts') }}
-      </h2>
-      <Button
-        :label="__('Add Account')"
-        theme="gray"
-        variant="solid"
-        @click="emit('update:step', 'email-add')"
-      >
-        <template #prefix>
-          <LucidePlus class="w-4 h-4" />
-        </template>
-      </Button>
+    <div class="flex justify-between">
+      <div class="flex flex-col gap-1 w-9/12">
+        <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
+          {{ __('Email accounts') }}
+        </h2>
+        <p class="text-p-base text-ink-gray-6">
+          {{
+            __(
+              'Manage your email accounts to send and receive emails directly from CRM. You can add multiple accounts and set one as default for incoming and outgoing emails.',
+            )
+          }}
+        </p>
+      </div>
+      <div class="flex item-center space-x-2 w-3/12 justify-end">
+        <Button
+          :label="__('Add Account')"
+          theme="gray"
+          variant="solid"
+          icon-left="plus"
+          @click="emit('update:step', 'email-add')"
+        />
+      </div>
     </div>
+
     <!-- list accounts -->
     <div
       v-if="!emailAccounts.loading && Boolean(emailAccounts.data?.length)"
diff --git a/frontend/src/components/Settings/GeneralSettings.vue b/frontend/src/components/Settings/GeneralSettings.vue
index b8a3f328..20beff3e 100644
--- a/frontend/src/components/Settings/GeneralSettings.vue
+++ b/frontend/src/components/Settings/GeneralSettings.vue
@@ -1,14 +1,29 @@
 <template>
-  <div class="flex h-full flex-col gap-8 p-8 text-ink-gray-9">
-    <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
-      {{ __('General') }}
-      <Badge
-        v-if="settings.isDirty"
-        :label="__('Not Saved')"
-        variant="subtle"
-        theme="orange"
-      />
-    </h2>
+  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-9">
+    <div class="flex justify-between">
+      <div class="flex flex-col gap-1 w-9/12">
+        <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
+          {{ __('General') }}
+          <Badge
+            v-if="settings.isDirty"
+            :label="__('Not Saved')"
+            variant="subtle"
+            theme="orange"
+          />
+        </h2>
+        <p class="text-p-base text-ink-gray-6">
+          {{ __('Configure general settings for your CRM') }}
+        </p>
+      </div>
+      <div class="flex item-center space-x-2 w-3/12 justify-end">
+        <Button
+          variant="solid"
+          :label="__('Update')"
+          :disabled="!settings.isDirty"
+          @click="updateSettings"
+        />
+      </div>
+    </div>
 
     <div v-if="settings.doc" class="flex-1 flex flex-col gap-8 overflow-y-auto">
       <div class="flex w-full">
@@ -16,7 +31,7 @@
           type="text"
           class="w-1/2"
           v-model="settings.doc.brand_name"
-          :label="__('Brand Name')"
+          :label="__('Brand name')"
         />
       </div>
 
@@ -107,15 +122,7 @@
       </div>
     </div>
 
-    <div class="flex justify-between flex-row-reverse">
-      <Button
-        variant="solid"
-        :label="__('Update')"
-        :disabled="!settings.isDirty"
-        @click="updateSettings"
-      />
-      <ErrorMessage :message="settings.save.error" />
-    </div>
+    <ErrorMessage :message="settings.save.error" />
   </div>
 </template>
 <script setup>
diff --git a/frontend/src/components/Settings/InviteUserPage.vue b/frontend/src/components/Settings/InviteUserPage.vue
index 77ce8211..14bdf849 100644
--- a/frontend/src/components/Settings/InviteUserPage.vue
+++ b/frontend/src/components/Settings/InviteUserPage.vue
@@ -1,8 +1,28 @@
 <template>
-  <div class="flex h-full flex-col gap-8 p-8 text-ink-gray-9">
-    <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
-      {{ __('Send Invites To') }}
-    </h2>
+  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-9">
+    <div class="flex justify-between">
+      <div class="flex flex-col gap-1 w-9/12">
+        <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
+          {{ __('Send invites to') }}
+        </h2>
+        <p class="text-p-base text-ink-gray-6">
+          {{
+            __(
+              'Invite users to access CRM. Specify their roles to control access and permissions',
+            )
+          }}
+        </p>
+      </div>
+      <div class="flex item-center space-x-2 w-3/12 justify-end">
+        <Button
+          :label="__('Send Invites')"
+          variant="solid"
+          :disabled="!invitees.length"
+          @click="inviteByEmail.submit()"
+          :loading="inviteByEmail.loading"
+        />
+      </div>
+    </div>
     <div class="flex-1 flex flex-col gap-8 overflow-y-auto">
       <div>
         <label class="block text-xs text-ink-gray-5 mb-1.5">
@@ -79,16 +99,7 @@
         </div>
       </template>
     </div>
-    <div class="flex justify-between items-center gap-2">
-      <div><ErrorMessage v-if="error" :message="error" /></div>
-      <Button
-        :label="__('Send Invites')"
-        variant="solid"
-        :disabled="!invitees.length"
-        @click="inviteByEmail.submit()"
-        :loading="inviteByEmail.loading"
-      />
-    </div>
+    <ErrorMessage :message="error" />
   </div>
 </template>
 <script setup>
diff --git a/frontend/src/components/Settings/SettingsPage.vue b/frontend/src/components/Settings/SettingsPage.vue
index ce212619..297656eb 100644
--- a/frontend/src/components/Settings/SettingsPage.vue
+++ b/frontend/src/components/Settings/SettingsPage.vue
@@ -1,16 +1,28 @@
 <template>
-  <div class="flex h-full flex-col gap-8">
-    <h2
-      class="flex gap-2 text-xl font-semibold leading-none h-5 text-ink-gray-9"
-    >
-      <div>{{ title || __(doctype) }}</div>
-      <Badge
-        v-if="data.isDirty"
-        :label="__('Not Saved')"
-        variant="subtle"
-        theme="orange"
-      />
-    </h2>
+  <div class="flex h-full flex-col gap-6">
+    <div class="flex justify-between">
+      <div class="flex flex-col gap-1 w-9/12">
+        <h2
+          class="flex gap-2 text-xl font-semibold leading-none h-5 text-ink-gray-9"
+        >
+          {{ title || __(doctype) }}
+          <Badge
+            v-if="data.isDirty"
+            :label="__('Not Saved')"
+            variant="subtle"
+            theme="orange"
+          />
+        </h2>
+      </div>
+      <div class="flex item-center space-x-2 w-3/12 justify-end">
+        <Button
+          :loading="data.save.loading"
+          :label="__('Update')"
+          variant="solid"
+          @click="data.save.submit()"
+        />
+      </div>
+    </div>
     <div v-if="!data.get.loading" class="flex-1 overflow-y-auto">
       <FieldLayout
         v-if="data?.doc && tabs"
@@ -22,17 +34,7 @@
     <div v-else class="flex flex-1 items-center justify-center">
       <Spinner class="size-8" />
     </div>
-    <div class="flex justify-between gap-2">
-      <div>
-        <ErrorMessage class="mt-2" :message="data.save.error" />
-      </div>
-      <Button
-        :loading="data.save.loading"
-        :label="__('Update')"
-        variant="solid"
-        @click="data.save.submit()"
-      />
-    </div>
+    <ErrorMessage :message="data.save.error" />
   </div>
 </template>
 <script setup>
diff --git a/frontend/src/components/Settings/TelephonySettings.vue b/frontend/src/components/Settings/TelephonySettings.vue
index 240b4570..af944903 100644
--- a/frontend/src/components/Settings/TelephonySettings.vue
+++ b/frontend/src/components/Settings/TelephonySettings.vue
@@ -1,16 +1,31 @@
 <template>
-  <div class="flex h-full flex-col gap-8 p-8">
-    <h2
-      class="flex gap-2 text-xl font-semibold leading-none h-5 text-ink-gray-9"
-    >
-      <div>{{ __('Telephony Settings') }}</div>
-      <Badge
-        v-if="twilio.isDirty || exotel.isDirty || mediumChanged"
-        :label="__('Not Saved')"
-        variant="subtle"
-        theme="orange"
-      />
-    </h2>
+  <div class="flex h-full flex-col gap-6 p-8">
+    <div class="flex justify-between">
+      <div class="flex flex-col gap-1 w-9/12">
+        <h2
+          class="flex gap-2 text-xl font-semibold leading-none h-5 text-ink-gray-9"
+        >
+          {{ __('Telephony settings') }}
+          <Badge
+            v-if="twilio.isDirty || exotel.isDirty || mediumChanged"
+            :label="__('Not Saved')"
+            variant="subtle"
+            theme="orange"
+          />
+        </h2>
+        <p class="text-p-base text-ink-gray-6">
+          {{ __('Configure telephony settings for your CRM') }}
+        </p>
+      </div>
+      <div class="flex item-center space-x-2 w-3/12 justify-end">
+        <Button
+          :loading="twilio.save.loading || exotel.save.loading"
+          :label="__('Update')"
+          variant="solid"
+          @click="update"
+        />
+      </div>
+    </div>
     <div
       v-if="!twilio.get.loading || !exotel.get.loading"
       class="flex-1 flex flex-col gap-8 overflow-y-auto"
@@ -58,20 +73,7 @@
     <div v-else class="flex flex-1 items-center justify-center">
       <Spinner class="size-8" />
     </div>
-    <div class="flex justify-between gap-2">
-      <div>
-        <ErrorMessage
-          class="mt-2"
-          :message="twilio.save.error || exotel.save.error || error"
-        />
-      </div>
-      <Button
-        :loading="twilio.save.loading || exotel.save.loading"
-        :label="__('Update')"
-        variant="solid"
-        @click="update"
-      />
-    </div>
+    <ErrorMessage :message="twilio.save.error || exotel.save.error || error" />
   </div>
 </template>
 <script setup>
diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index d7c29e8a..aca6344e 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -9,7 +9,7 @@
         <p class="text-p-base text-ink-gray-6">
           {{
             __(
-              'Manage users who can access CRM. Assign roles to control their access. Add/Remove existing users or invite new ones.',
+              'Manage CRM users by adding or inviting them, and assign roles to control their access and permissions',
             )
           }}
         </p>

From 7f18b78be8788310b93bdc492596e466860cc878 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 17:25:14 +0530
Subject: [PATCH 40/51] chore: fixed warning

(cherry picked from commit 96c8aae01ef0b2977b8ef71dc0097e29f9b4201d)
---
 frontend/src/components/Controls/Grid.vue     | 6 +++---
 frontend/src/components/FieldLayout/Field.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Controls/Grid.vue b/frontend/src/components/Controls/Grid.vue
index dcfa2846..096b3542 100644
--- a/frontend/src/components/Controls/Grid.vue
+++ b/frontend/src/components/Controls/Grid.vue
@@ -380,9 +380,9 @@ const props = defineProps({
   },
 })
 
-const triggerOnChange = inject('triggerOnChange')
-const triggerOnRowAdd = inject('triggerOnRowAdd')
-const triggerOnRowRemove = inject('triggerOnRowRemove')
+const triggerOnChange = inject('triggerOnChange', () => {})
+const triggerOnRowAdd = inject('triggerOnRowAdd', () => {})
+const triggerOnRowRemove = inject('triggerOnRowRemove', () => {})
 
 const {
   getGridViewSettings,
diff --git a/frontend/src/components/FieldLayout/Field.vue b/frontend/src/components/FieldLayout/Field.vue
index 07f530cd..20a8656d 100644
--- a/frontend/src/components/FieldLayout/Field.vue
+++ b/frontend/src/components/FieldLayout/Field.vue
@@ -260,7 +260,7 @@ if (!isGridRow) {
   provide('triggerOnRowAdd', triggerOnRowAdd)
   provide('triggerOnRowRemove', triggerOnRowRemove)
 } else {
-  triggerOnChange = inject('triggerOnChange')
+  triggerOnChange = inject('triggerOnChange', () => {})
   parentDoc = inject('parentDoc')
 }
 

From 5aaacde6e6d7cedff21d377c3d465dfb05777d36 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 17:42:10 +0530
Subject: [PATCH 41/51] fix: dark mode fixes for email account setting

(cherry picked from commit eee1190f10623b6daa374ed59676f639152ceae7)

# Conflicts:
#	frontend/src/components/Settings/ProfileImageEditor.vue
---
 .../components/Settings/ERPNextSettings.vue   |  4 ++--
 .../components/Settings/EmailAccountCard.vue  |  6 +++---
 .../components/Settings/EmailAccountList.vue  |  4 ++--
 frontend/src/components/Settings/EmailAdd.vue | 20 +++++++++----------
 .../src/components/Settings/EmailEdit.vue     | 14 ++++++-------
 .../components/Settings/EmailProviderIcon.vue | 11 +++-------
 .../components/Settings/ProfileSettings.vue   |  4 ++--
 7 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/frontend/src/components/Settings/ERPNextSettings.vue b/frontend/src/components/Settings/ERPNextSettings.vue
index 697a5503..16db1e5c 100644
--- a/frontend/src/components/Settings/ERPNextSettings.vue
+++ b/frontend/src/components/Settings/ERPNextSettings.vue
@@ -1,8 +1,8 @@
 <template>
   <SettingsPage
     doctype="ERPNext CRM Settings"
-    :title="__('ERPNext Settings')"
-    :successMessage="__('ERPNext Settings updated')"
+    :title="__('ERPNext settings')"
+    :successMessage="__('ERPNext settings updated')"
     class="p-8"
   />
 </template>
diff --git a/frontend/src/components/Settings/EmailAccountCard.vue b/frontend/src/components/Settings/EmailAccountCard.vue
index 2890d43b..51ac9b2a 100644
--- a/frontend/src/components/Settings/EmailAccountCard.vue
+++ b/frontend/src/components/Settings/EmailAccountCard.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex items-center justify-between p-1 py-3 border-b border-gray-200 dark:border-gray-700 cursor-pointer"
+    class="flex items-center justify-between p-1 py-3 border-b border-outline-gray-modals cursor-pointer"
   >
     <!-- avatar and name -->
     <div class="flex items-center justify-between gap-2">
@@ -9,11 +9,11 @@
         <p class="text-sm font-semibold text-ink-gray-9">
           {{ emailAccount.email_account_name }}
         </p>
-        <div class="text-sm text-gray-500">{{ emailAccount.email_id }}</div>
+        <div class="text-sm text-ink-gray-4">{{ emailAccount.email_id }}</div>
       </div>
     </div>
     <div>
-      <Badge variant="subtle" :label="badgeTitle" :theme="gray" />
+      <Badge variant="subtle" :label="badgeTitle" theme="gray" />
     </div>
     <!-- email id -->
   </div>
diff --git a/frontend/src/components/Settings/EmailAccountList.vue b/frontend/src/components/Settings/EmailAccountList.vue
index 192ee910..90d258cd 100644
--- a/frontend/src/components/Settings/EmailAccountList.vue
+++ b/frontend/src/components/Settings/EmailAccountList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- header -->
-    <div class="flex justify-between">
+    <div class="flex justify-between text-ink-gray-9">
       <div class="flex flex-col gap-1 w-9/12">
         <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
           {{ __('Email accounts') }}
@@ -38,7 +38,7 @@
       </div>
     </div>
     <!-- fallback if no email accounts -->
-    <div v-else class="flex items-center justify-center h-64 text-gray-500">
+    <div v-else class="flex items-center justify-center h-64 text-ink-gray-4">
       {{ __('Please add an email account to continue.') }}
     </div>
   </div>
diff --git a/frontend/src/components/Settings/EmailAdd.vue b/frontend/src/components/Settings/EmailAdd.vue
index 19a0ac29..4e69a5bf 100644
--- a/frontend/src/components/Settings/EmailAdd.vue
+++ b/frontend/src/components/Settings/EmailAdd.vue
@@ -5,7 +5,7 @@
       <h2 class="text-xl font-semibold text-ink-gray-9">
         {{ __('Setup Email') }}
       </h2>
-      <p class="text-sm text-gray-600">
+      <p class="text-sm text-ink-gray-5">
         {{ __('Choose the email service provider you want to configure.') }}
       </p>
     </div>
@@ -27,14 +27,15 @@
     <div v-if="selectedService" class="flex flex-col gap-4">
       <!-- email service provider info -->
       <div
-        class="flex items-center gap-2 p-2 rounded-md ring-1 ring-gray-400 dark:ring-gray-700 text-gray-700 dark:text-gray-500"
+        class="flex items-center gap-2 p-2 rounded-md ring-1 ring-outline-gray-3 text-ink-gray-6"
       >
         <CircleAlert class="w-5 h-6 w-min-5 w-max-5 min-h-5 max-w-5" />
         <div class="text-xs text-wrap">
           {{ selectedService.info }}
-          <a :href="selectedService.link" target="_blank" class="underline"
-            >here</a
-          >.
+          <a :href="selectedService.link" target="_blank" class="underline">
+            {{ __('here') }}
+          </a>
+          .
         </div>
       </div>
       <!-- service provider fields -->
@@ -66,23 +67,22 @@
               :name="field.name"
               :type="field.type"
             />
-            <p class="text-gray-500 text-p-sm">{{ field.description }}</p>
+            <p class="text-ink-gray-4 text-p-sm">{{ field.description }}</p>
           </div>
         </div>
-        <ErrorMessage v-if="error" class="ml-1" :message="error" />
+        <ErrorMessage class="ml-1" :message="error" />
       </div>
     </div>
     <!-- action button -->
     <div v-if="selectedService" class="flex justify-between mt-auto">
       <Button
-        label="Back"
-        theme="gray"
+        :label="__('Back')"
         variant="outline"
         :disabled="addEmailRes.loading"
         @click="emit('update:step', 'email-list')"
       />
       <Button
-        label="Create"
+        :label="__('Create')"
         variant="solid"
         :loading="addEmailRes.loading"
         @click="createEmailAccount"
diff --git a/frontend/src/components/Settings/EmailEdit.vue b/frontend/src/components/Settings/EmailEdit.vue
index be6fe296..0c2ebb21 100644
--- a/frontend/src/components/Settings/EmailEdit.vue
+++ b/frontend/src/components/Settings/EmailEdit.vue
@@ -14,16 +14,16 @@
     </div>
     <!-- banner for setting up email account -->
     <div
-      class="flex items-center gap-2 p-2 rounded-md ring-1 ring-gray-400 dark:ring-gray-700"
+      class="flex items-center gap-2 p-2 rounded-md ring-1 ring-outline-gray-3"
     >
       <CircleAlert
-        class="size-6 text-gray-500 w-min-5 w-max-5 min-h-5 max-w-5"
+        class="size-6 text-ink-gray-4 w-min-5 w-max-5 min-h-5 max-w-5"
       />
-      <div class="text-xs text-gray-700 dark:text-gray-500 text-wrap">
+      <div class="text-xs text-ink-gray-6 text-wrap">
         {{ info.description }}
-        <a :href="info.link" target="_blank" class="underline">{{
-          __('here')
-        }}</a>
+        <a :href="info.link" target="_blank" class="underline">
+          {{ __('here') }}
+        </a>
         .
       </div>
     </div>
@@ -56,7 +56,7 @@
             :name="field.name"
             :type="field.type"
           />
-          <p class="text-gray-500 text-p-sm">{{ field.description }}</p>
+          <p class="text-ink-gray-4 text-p-sm">{{ field.description }}</p>
         </div>
       </div>
       <ErrorMessage v-if="error" class="ml-1" :message="error" />
diff --git a/frontend/src/components/Settings/EmailProviderIcon.vue b/frontend/src/components/Settings/EmailProviderIcon.vue
index 3d902bf9..047ee8ce 100644
--- a/frontend/src/components/Settings/EmailProviderIcon.vue
+++ b/frontend/src/components/Settings/EmailProviderIcon.vue
@@ -1,14 +1,11 @@
 <template>
   <div
-    class="flex items-center justify-center w-8 h-8 bg-gray-100 cursor-pointer rounded-xl hover:bg-gray-200"
-    :class="{ 'ring-2 ring-gray-500 dark:ring-gray-100': selected }"
+    class="flex items-center justify-center w-8 h-8 bg-surface-gray-2 cursor-pointer rounded-xl hover:bg-surface-gray-3"
+    :class="{ 'ring-2 ring-outline-gray-4': selected }"
   >
     <img :src="logo" class="w-4 h-4" />
   </div>
-  <p
-    v-if="serviceName"
-    class="text-xs text-center text-gray-700 dark:text-gray-500 mt-2"
-  >
+  <p v-if="serviceName" class="text-xs text-center text-ink-gray-6 mt-2">
     {{ serviceName }}
   </p>
 </template>
@@ -29,5 +26,3 @@ defineProps({
   },
 })
 </script>
-
-<style scoped></style>
diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index 7f19029f..b2899157 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="flex h-full flex-col gap-8 p-8 text-ink-gray-9">
-    <div class="flex-1 flex flex-col gap-8 mt-2 overflow-y-auto">
+  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-9">
+    <div class="flex-1 flex flex-col gap-6 mt-2 overflow-y-auto">
       <div v-if="profile" class="flex w-full items-center justify-between">
         <FileUploader
           @success="(file) => updateImage(file.file_url)"

From aa60a03484c803dfe961727e09ee288032020d2a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 17:47:07 +0530
Subject: [PATCH 42/51] fix: use text-ink-gray-8 instead of 9

(cherry picked from commit 0230360145edf92bf8f9a3d8a5ab593f93ec71a3)
---
 frontend/src/components/Settings/EmailAccountCard.vue  | 2 +-
 frontend/src/components/Settings/EmailAccountList.vue  | 2 +-
 frontend/src/components/Settings/EmailAdd.vue          | 2 +-
 frontend/src/components/Settings/EmailEdit.vue         | 2 +-
 frontend/src/components/Settings/GeneralSettings.vue   | 8 ++++----
 frontend/src/components/Settings/InviteUserPage.vue    | 4 ++--
 frontend/src/components/Settings/ProfileSettings.vue   | 4 ++--
 frontend/src/components/Settings/Settings.vue          | 2 +-
 frontend/src/components/Settings/SettingsPage.vue      | 2 +-
 frontend/src/components/Settings/TelephonySettings.vue | 6 +++---
 frontend/src/components/Settings/Users.vue             | 6 +++---
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/Settings/EmailAccountCard.vue b/frontend/src/components/Settings/EmailAccountCard.vue
index 51ac9b2a..e7f693e4 100644
--- a/frontend/src/components/Settings/EmailAccountCard.vue
+++ b/frontend/src/components/Settings/EmailAccountCard.vue
@@ -6,7 +6,7 @@
     <div class="flex items-center justify-between gap-2">
       <EmailProviderIcon :logo="emailIcon[emailAccount.service]" />
       <div>
-        <p class="text-sm font-semibold text-ink-gray-9">
+        <p class="text-sm font-semibold text-ink-gray-8">
           {{ emailAccount.email_account_name }}
         </p>
         <div class="text-sm text-ink-gray-4">{{ emailAccount.email_id }}</div>
diff --git a/frontend/src/components/Settings/EmailAccountList.vue b/frontend/src/components/Settings/EmailAccountList.vue
index 90d258cd..3b62ae45 100644
--- a/frontend/src/components/Settings/EmailAccountList.vue
+++ b/frontend/src/components/Settings/EmailAccountList.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- header -->
-    <div class="flex justify-between text-ink-gray-9">
+    <div class="flex justify-between text-ink-gray-8">
       <div class="flex flex-col gap-1 w-9/12">
         <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
           {{ __('Email accounts') }}
diff --git a/frontend/src/components/Settings/EmailAdd.vue b/frontend/src/components/Settings/EmailAdd.vue
index 4e69a5bf..b4f13e54 100644
--- a/frontend/src/components/Settings/EmailAdd.vue
+++ b/frontend/src/components/Settings/EmailAdd.vue
@@ -2,7 +2,7 @@
   <div class="flex flex-col h-full gap-4">
     <!-- title and desc -->
     <div role="heading" aria-level="1" class="flex flex-col gap-1">
-      <h2 class="text-xl font-semibold text-ink-gray-9">
+      <h2 class="text-xl font-semibold text-ink-gray-8">
         {{ __('Setup Email') }}
       </h2>
       <p class="text-sm text-ink-gray-5">
diff --git a/frontend/src/components/Settings/EmailEdit.vue b/frontend/src/components/Settings/EmailEdit.vue
index 0c2ebb21..09cbe6b2 100644
--- a/frontend/src/components/Settings/EmailEdit.vue
+++ b/frontend/src/components/Settings/EmailEdit.vue
@@ -2,7 +2,7 @@
   <div class="flex flex-col h-full gap-4">
     <!-- title and desc -->
     <div role="heading" aria-level="1" class="flex justify-between gap-1">
-      <h2 class="text-xl font-semibold text-ink-gray-9">
+      <h2 class="text-xl font-semibold text-ink-gray-8">
         {{ __('Edit Email') }}
       </h2>
     </div>
diff --git a/frontend/src/components/Settings/GeneralSettings.vue b/frontend/src/components/Settings/GeneralSettings.vue
index 20beff3e..14a78780 100644
--- a/frontend/src/components/Settings/GeneralSettings.vue
+++ b/frontend/src/components/Settings/GeneralSettings.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-9">
+  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-8">
     <div class="flex justify-between">
       <div class="flex flex-col gap-1 w-9/12">
         <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
@@ -38,7 +38,7 @@
       <!-- logo -->
 
       <div class="flex flex-col justify-between gap-4">
-        <span class="text-base font-semibold text-ink-gray-9">
+        <span class="text-base font-semibold text-ink-gray-8">
           {{ __('Logo') }}
         </span>
         <div class="flex flex-1 gap-5">
@@ -73,7 +73,7 @@
       <!-- favicon -->
 
       <div class="flex flex-col justify-between gap-4">
-        <span class="text-base font-semibold text-ink-gray-9">
+        <span class="text-base font-semibold text-ink-gray-8">
           {{ __('Favicon') }}
         </span>
         <div class="flex flex-1 gap-5">
@@ -108,7 +108,7 @@
       <!-- Home actions -->
 
       <div class="flex flex-col justify-between gap-4">
-        <span class="text-base font-semibold text-ink-gray-9">
+        <span class="text-base font-semibold text-ink-gray-8">
           {{ __('Home actions') }}
         </span>
         <div class="flex flex-1">
diff --git a/frontend/src/components/Settings/InviteUserPage.vue b/frontend/src/components/Settings/InviteUserPage.vue
index 14bdf849..6402f416 100644
--- a/frontend/src/components/Settings/InviteUserPage.vue
+++ b/frontend/src/components/Settings/InviteUserPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-9">
+  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-8">
     <div class="flex justify-between">
       <div class="flex flex-col gap-1 w-9/12">
         <h2 class="flex gap-2 text-xl font-semibold leading-none h-5">
@@ -72,7 +72,7 @@
               :key="user.name"
             >
               <div class="text-base">
-                <span class="text-ink-gray-9">
+                <span class="text-ink-gray-8">
                   {{ user.email }}
                 </span>
                 <span class="text-ink-gray-5">
diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index b2899157..2d7fc253 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-9">
+  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-8">
     <div class="flex-1 flex flex-col gap-6 mt-2 overflow-y-auto">
       <div v-if="profile" class="flex w-full items-center justify-between">
         <FileUploader
@@ -50,7 +50,7 @@
                 </component>
               </div>
               <div class="flex flex-col gap-1">
-                <span class="text-2xl font-semibold text-ink-gray-9">
+                <span class="text-2xl font-semibold text-ink-gray-8">
                   {{ profile.full_name }}
                 </span>
                 <span class="text-base text-ink-gray-7">
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index c81fa5f3..e4662770 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -7,7 +7,7 @@
     <template #body>
       <div class="flex h-[calc(100vh_-_8rem)]">
         <div class="flex flex-col p-2 w-52 shrink-0 bg-surface-gray-2">
-          <h1 class="px-2 pt-2 mb-3 text-lg font-semibold text-ink-gray-9">
+          <h1 class="px-2 pt-2 mb-3 text-lg font-semibold text-ink-gray-8">
             {{ __('Settings') }}
           </h1>
           <div v-for="tab in tabs">
diff --git a/frontend/src/components/Settings/SettingsPage.vue b/frontend/src/components/Settings/SettingsPage.vue
index 297656eb..31a57f63 100644
--- a/frontend/src/components/Settings/SettingsPage.vue
+++ b/frontend/src/components/Settings/SettingsPage.vue
@@ -3,7 +3,7 @@
     <div class="flex justify-between">
       <div class="flex flex-col gap-1 w-9/12">
         <h2
-          class="flex gap-2 text-xl font-semibold leading-none h-5 text-ink-gray-9"
+          class="flex gap-2 text-xl font-semibold leading-none h-5 text-ink-gray-8"
         >
           {{ title || __(doctype) }}
           <Badge
diff --git a/frontend/src/components/Settings/TelephonySettings.vue b/frontend/src/components/Settings/TelephonySettings.vue
index af944903..08681fff 100644
--- a/frontend/src/components/Settings/TelephonySettings.vue
+++ b/frontend/src/components/Settings/TelephonySettings.vue
@@ -3,7 +3,7 @@
     <div class="flex justify-between">
       <div class="flex flex-col gap-1 w-9/12">
         <h2
-          class="flex gap-2 text-xl font-semibold leading-none h-5 text-ink-gray-9"
+          class="flex gap-2 text-xl font-semibold leading-none h-5 text-ink-gray-8"
         >
           {{ __('Telephony settings') }}
           <Badge
@@ -46,7 +46,7 @@
 
       <!-- Twilio -->
       <div v-if="isManager()" class="flex flex-col justify-between gap-4">
-        <span class="text-base font-semibold text-ink-gray-9">
+        <span class="text-base font-semibold text-ink-gray-8">
           {{ __('Twilio') }}
         </span>
         <FieldLayout
@@ -59,7 +59,7 @@
 
       <!-- Exotel -->
       <div v-if="isManager()" class="flex flex-col justify-between gap-4">
-        <span class="text-base font-semibold text-ink-gray-9">
+        <span class="text-base font-semibold text-ink-gray-8">
           {{ __('Exotel') }}
         </span>
         <FieldLayout
diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index aca6344e..9cab8739 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-9">
+  <div class="flex h-full flex-col gap-6 p-8 text-ink-gray-8">
     <!-- Header -->
     <div class="flex justify-between">
       <div class="flex flex-col gap-1 w-9/12">
@@ -53,7 +53,7 @@
               size="xl"
             />
             <div class="flex flex-col gap-1 ml-3">
-              <div class="flex items-center text-base text-ink-gray-9 h-4">
+              <div class="flex items-center text-base text-ink-gray-8 h-4">
                 {{ user.full_name }}
               </div>
               <div class="text-base text-ink-gray-5">
@@ -196,7 +196,7 @@ function RoleOption({ active, role, onClick, selected }) {
     'button',
     {
       class: [
-        active ? 'bg-surface-gray-2' : 'text-ink-gray-9',
+        active ? 'bg-surface-gray-2' : 'text-ink-gray-8',
         'group flex w-full justify-between items-center rounded-md px-2 py-2 text-sm',
       ],
       onClick: !selected ? onClick : null,

From bae37529e5b347bcee6944c523a4f14465cdef43 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 17:56:14 +0530
Subject: [PATCH 43/51] fix: if role is set to sales user then remove modules
 and set FCRM

(cherry picked from commit bd7451e86f1b41483ffc92c51ab51457c4d31490)
---
 crm/api/user.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/crm/api/user.py b/crm/api/user.py
index ab20fbda..b0eda557 100644
--- a/crm/api/user.py
+++ b/crm/api/user.py
@@ -31,14 +31,16 @@ def update_user_role(user, new_role):
 
 	if new_role == "System Manager":
 		user_doc.append_roles("System Manager", "Sales Manager", "Sales User")
+		user_doc.set("block_modules", [])
 	if new_role == "Sales Manager":
 		user_doc.append_roles("Sales Manager", "Sales User")
 		user_doc.remove_roles("System Manager")
 	if new_role == "Sales User":
 		user_doc.append_roles("Sales User")
 		user_doc.remove_roles("Sales Manager", "System Manager")
+		update_module_in_user(user_doc, "FCRM")
 
-	user_doc.save()
+	user_doc.save(ignore_permissions=True)
 
 
 @frappe.whitelist()
@@ -61,8 +63,9 @@ def add_user(user, role):
 		user_doc.append_roles("Sales Manager", "Sales User")
 	elif role == "Sales User":
 		user_doc.append_roles("Sales User")
+		update_module_in_user(user_doc, "FCRM")
 
-	user_doc.save()
+	user_doc.save(ignore_permissions=True)
 
 
 @frappe.whitelist()
@@ -81,5 +84,16 @@ def remove_user(user):
 	if "Sales Manager" in roles:
 		user_doc.remove_roles("Sales Manager")
 
-	user_doc.save()
+	user_doc.save(ignore_permissions=True)
 	frappe.msgprint(f"User {user} has been removed from CRM roles.")
+
+
+def update_module_in_user(user, module):
+	block_modules = frappe.get_all(
+		"Module Def",
+		fields=["name as module"],
+		filters={"name": ["!=", module]},
+	)
+
+	if block_modules:
+		user.set("block_modules", block_modules)

From df605f1a9aa79d84fa87640dbdad172f48313a04 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 18:55:14 +0530
Subject: [PATCH 44/51] fix: add user is actually add role

(cherry picked from commit ad1aee9c9e03f37e1deabc5b3941032e165f60a8)
---
 crm/api/user.py | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/crm/api/user.py b/crm/api/user.py
index b0eda557..7eef6d50 100644
--- a/crm/api/user.py
+++ b/crm/api/user.py
@@ -50,22 +50,7 @@ def add_user(user, role):
 	:param user: The name of the user to be added
 	:param role: The role to be assigned (Sales User or Sales Manager)
 	"""
-	frappe.only_for(["System Manager", "Sales Manager"])
-
-	if role not in ["System Manager", "Sales Manager", "Sales User"]:
-		frappe.throw("Cannot assign this role")
-
-	user_doc = frappe.get_doc("User", user)
-
-	if role == "System Manager":
-		user_doc.append_roles("System Manager", "Sales Manager", "Sales User")
-	elif role == "Sales Manager":
-		user_doc.append_roles("Sales Manager", "Sales User")
-	elif role == "Sales User":
-		user_doc.append_roles("Sales User")
-		update_module_in_user(user_doc, "FCRM")
-
-	user_doc.save(ignore_permissions=True)
+	update_user_role(user, role)
 
 
 @frappe.whitelist()

From b83b4847e7de4482d026a8a36daa41cd789d7df7 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 18:55:42 +0530
Subject: [PATCH 45/51] fix: loading state in Users page

(cherry picked from commit 2fdea90ad4176b40ac6a8a8d2d75cd6fcf64ce8b)
---
 frontend/src/components/Settings/Users.vue | 46 ++++++++++++----------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index 9cab8739..41838818 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -36,6 +36,32 @@
       </div>
     </div>
 
+    <!-- loading state -->
+    <div v-if="users.loading" class="flex mt-28 justify-between w-full h-full">
+      <Button
+        :loading="users.loading"
+        variant="ghost"
+        class="w-full"
+        size="2xl"
+      />
+    </div>
+
+    <!-- Empty State -->
+    <div
+      v-if="
+        !users.loading &&
+        users.data?.crmUsers?.length === 1 &&
+        users.data?.crmUsers[0].name == 'Administrator'
+      "
+      class="flex justify-between w-full h-full"
+    >
+      <div
+        class="text-ink-gray-4 border border-dashed rounded w-full flex items-center justify-center"
+      >
+        {{ __('No users found') }}
+      </div>
+    </div>
+
     <!-- Users List -->
     <ul
       v-if="!users.loading && Boolean(users.data?.crmUsers?.length)"
@@ -94,26 +120,6 @@
         />
       </div>
     </ul>
-
-    <!-- loading state -->
-    <div v-if="users.loading" class="flex mt-28 justify-between w-full h-full">
-      <Button
-        :loading="users.loading"
-        variant="ghost"
-        class="w-full"
-        size="2xl"
-      />
-    </div>
-
-    <!-- Empty State -->
-    <div
-      v-if="!users.loading && !users.data?.crmUsers?.length"
-      class="flex mt-28 justify-between w-full h-full"
-    >
-      <p class="text-sm text-gray-500 w-full flex justify-center">
-        {{ __('No users found') }}
-      </p>
-    </div>
   </div>
   <AddExistingUserModal
     v-if="showAddExistingModal"

From 59999599a328c1d33806ce4103fb915b0e59a6f8 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 20 Jun 2025 18:57:09 +0530
Subject: [PATCH 46/51] fix: use crmUsers in all link field

(cherry picked from commit e9573278773f77b9b179c0e088a73011f3f5f9ff)
---
 .../src/components/Activities/DataFields.vue  |   2 +-
 frontend/src/components/Controls/Grid.vue     |  10 +-
 frontend/src/components/FieldLayout/Field.vue |   6 +-
 .../Modals/AddExistingUserModal.vue           |   2 +-
 .../src/components/Modals/AssignmentModal.vue |   3 +-
 frontend/src/components/Modals/TaskModal.vue  | 139 +++++++++++-------
 frontend/src/components/SidePanelLayout.vue   |   7 +-
 .../src/components/Telephony/TaskPanel.vue    |   5 +-
 8 files changed, 116 insertions(+), 58 deletions(-)

diff --git a/frontend/src/components/Activities/DataFields.vue b/frontend/src/components/Activities/DataFields.vue
index 5b97e80a..88119f80 100644
--- a/frontend/src/components/Activities/DataFields.vue
+++ b/frontend/src/components/Activities/DataFields.vue
@@ -31,7 +31,7 @@
   </div>
   <div
     v-if="document.get.loading"
-    class="flex flex-1 flex-col items-center justify-center gap-3 text-xl font-medium text-gray-500"
+    class="flex flex-1 flex-col items-center justify-center gap-3 text-xl font-medium text-ink-gray-6"
   >
     <LoadingIndicator class="h-6 w-6" />
     <span>{{ __('Loading...') }}</span>
diff --git a/frontend/src/components/Controls/Grid.vue b/frontend/src/components/Controls/Grid.vue
index 096b3542..cce8b245 100644
--- a/frontend/src/components/Controls/Grid.vue
+++ b/frontend/src/components/Controls/Grid.vue
@@ -393,7 +393,7 @@ const {
   getGridSettings,
 } = getMeta(props.doctype)
 getMeta(props.parentDoctype)
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 
 const rows = defineModel()
 const parentDoc = defineModel('parent')
@@ -438,6 +438,14 @@ function getFieldObj(field) {
     }
   }
 
+  if (field.fieldtype === 'Link' && field.options === 'User') {
+    field.fieldtype = 'User'
+    field.link_filters = JSON.stringify({
+      ...(field.link_filters ? JSON.parse(field.link_filters) : {}),
+      name: ['in', users.data.crmUsers?.map((user) => user.name)],
+    })
+  }
+
   return {
     ...field,
     filters: field.link_filters && JSON.parse(field.link_filters),
diff --git a/frontend/src/components/FieldLayout/Field.vue b/frontend/src/components/FieldLayout/Field.vue
index 20a8656d..a70ff591 100644
--- a/frontend/src/components/FieldLayout/Field.vue
+++ b/frontend/src/components/FieldLayout/Field.vue
@@ -243,7 +243,7 @@ const isGridRow = inject('isGridRow')
 const { getFormattedPercent, getFormattedFloat, getFormattedCurrency } =
   getMeta(doctype)
 
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 
 let triggerOnChange
 let parentDoc
@@ -278,6 +278,10 @@ const field = computed(() => {
 
   if (field.fieldtype === 'Link' && field.options === 'User') {
     field.fieldtype = 'User'
+    field.link_filters = JSON.stringify({
+      ...(field.link_filters ? JSON.parse(field.link_filters) : {}),
+      name: ['in', users.data.crmUsers?.map((user) => user.name)],
+    })
   }
 
   if (field.fieldtype === 'Link' && field.options !== 'User') {
diff --git a/frontend/src/components/Modals/AddExistingUserModal.vue b/frontend/src/components/Modals/AddExistingUserModal.vue
index db6b2d4d..d11c2f61 100644
--- a/frontend/src/components/Modals/AddExistingUserModal.vue
+++ b/frontend/src/components/Modals/AddExistingUserModal.vue
@@ -22,7 +22,7 @@
 
       <div class="p-2 group bg-surface-gray-2 hover:bg-surface-gray-3 rounded">
         <MultiSelectUserInput
-          v-if="users?.data?.crmUsers.length"
+          v-if="users?.data?.crmUsers?.length"
           class="flex-1"
           inputClass="!bg-surface-gray-2 hover:!bg-surface-gray-3 group-hover:!bg-surface-gray-3"
           :placeholder="__('john@doe.com')"
diff --git a/frontend/src/components/Modals/AssignmentModal.vue b/frontend/src/components/Modals/AssignmentModal.vue
index 05cea454..c6fc6dfd 100644
--- a/frontend/src/components/Modals/AssignmentModal.vue
+++ b/frontend/src/components/Modals/AssignmentModal.vue
@@ -33,6 +33,7 @@
         doctype="User"
         @change="(option) => addValue(option) && ($refs.input.value = '')"
         :placeholder="__('John Doe')"
+        :filters="{ name: ['in', users.data.crmUsers?.map((user) => user.name)] }"
         :hideMe="true"
       >
         <template #item-prefix="{ option }">
@@ -105,7 +106,7 @@ const oldAssignees = ref([])
 
 const error = ref('')
 
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 
 const removeValue = (value) => {
   assignees.value = assignees.value.filter(
diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index a172b51e..98c2cd71 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -1,23 +1,32 @@
 <template>
-  <Dialog v-model="show" :options="{
-    size: 'xl',
-    actions: [
-      {
-        label: editMode ? __('Update') : __('Create'),
-        variant: 'solid',
-        onClick: () => updateTask(),
-      },
-    ],
-  }">
+  <Dialog
+    v-model="show"
+    :options="{
+      size: 'xl',
+      actions: [
+        {
+          label: editMode ? __('Update') : __('Create'),
+          variant: 'solid',
+          onClick: () => updateTask(),
+        },
+      ],
+    }"
+  >
     <template #body-title>
       <div class="flex items-center gap-3">
         <h3 class="text-2xl font-semibold leading-6 text-ink-gray-9">
           {{ editMode ? __('Edit Task') : __('Create Task') }}
         </h3>
-        <Button v-if="task?.reference_docname" size="sm" :label="task.reference_doctype == 'CRM Deal'
-          ? __('Open Deal')
-          : __('Open Lead')
-          " @click="redirect()">
+        <Button
+          v-if="task?.reference_docname"
+          size="sm"
+          :label="
+            task.reference_doctype == 'CRM Deal'
+              ? __('Open Deal')
+              : __('Open Lead')
+          "
+          @click="redirect()"
+        >
           <template #suffix>
             <ArrowUpRightIcon class="w-4 h-4" />
           </template>
@@ -27,17 +36,29 @@
     <template #body-content>
       <div class="flex flex-col gap-4">
         <div>
-          <FormControl ref="title" :label="__('Title')" v-model="_task.title" :placeholder="__('Call with John Doe')"
-            required />
+          <FormControl
+            ref="title"
+            :label="__('Title')"
+            v-model="_task.title"
+            :placeholder="__('Call with John Doe')"
+            required
+          />
         </div>
         <div>
           <div class="mb-1.5 text-xs text-ink-gray-5">
             {{ __('Description') }}
           </div>
-          <TextEditor variant="outline" ref="description"
+          <TextEditor
+            variant="outline"
+            ref="description"
             editor-class="!prose-sm overflow-auto min-h-[180px] max-h-80 py-1.5 px-2 rounded border border-[--surface-gray-2] bg-surface-gray-2 placeholder-ink-gray-4 hover:border-outline-gray-modals hover:bg-surface-gray-3 hover:shadow-sm focus:bg-surface-white focus:border-outline-gray-4 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3 text-ink-gray-8 transition-colors"
-            :bubbleMenu="true" :content="_task.description" @change="(val) => (_task.description = val)" :placeholder="__('Took a call with John Doe and discussed the new project.')
-              " />
+            :bubbleMenu="true"
+            :content="_task.description"
+            @change="(val) => (_task.description = val)"
+            :placeholder="
+              __('Took a call with John Doe and discussed the new project.')
+            "
+          />
         </div>
         <div class="flex flex-wrap items-center gap-2">
           <Dropdown :options="taskStatusOptions(updateTaskStatus)">
@@ -47,24 +68,38 @@
               </template>
             </Button>
           </Dropdown>
-          <Link class="form-control" :value="getUser(_task.assigned_to).full_name" doctype="User"
-            @change="(option) => (_task.assigned_to = option)" :placeholder="__('John Doe')" :hideMe="true">
-          <template #prefix>
-            <UserAvatar class="mr-2 !h-4 !w-4" :user="_task.assigned_to" />
-          </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 text-ink-gray-9">
-                {{ getUser(option.value).full_name }}
-              </div>
-            </Tooltip>
-          </template>
+          <Link
+            class="form-control"
+            :value="getUser(_task.assigned_to).full_name"
+            doctype="User"
+            @change="(option) => (_task.assigned_to = option)"
+            :placeholder="__('John Doe')"
+            :filters="{
+              name: ['in', users.data.crmUsers?.map((user) => user.name)],
+            }"
+            :hideMe="true"
+          >
+            <template #prefix>
+              <UserAvatar class="mr-2 !h-4 !w-4" :user="_task.assigned_to" />
+            </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 text-ink-gray-9">
+                  {{ getUser(option.value).full_name }}
+                </div>
+              </Tooltip>
+            </template>
           </Link>
-          <DateTimePicker class="datepicker w-36" v-model="_task.due_date" :placeholder="__('01/04/2024 11:30 PM')"
-            :formatter="(date) => getFormat(date, '', true, true)" input-class="border-none" />
+          <DateTimePicker
+            class="datepicker w-36"
+            v-model="_task.due_date"
+            :placeholder="__('01/04/2024 11:30 PM')"
+            :formatter="(date) => getFormat(date, '', true, true)"
+            input-class="border-none"
+          />
           <Dropdown :options="taskPriorityOptions(updateTaskPriority)">
             <Button :label="_task.priority" class="justify-between w-full">
               <template #prefix>
@@ -114,7 +149,7 @@ const tasks = defineModel('reloadTasks')
 const emit = defineEmits(['updateTask', 'after'])
 
 const router = useRouter()
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 const { updateOnboardingStep } = useOnboarding('frappecrm')
 
 const error = ref(null)
@@ -164,20 +199,24 @@ async function updateTask() {
       emit('after', d)
     }
   } else {
-    let d = await call('frappe.client.insert', {
-      doc: {
-        doctype: 'CRM Task',
-        reference_doctype: props.doctype,
-        reference_docname: props.doc || null,
-        ..._task.value,
+    let d = await call(
+      'frappe.client.insert',
+      {
+        doc: {
+          doctype: 'CRM Task',
+          reference_doctype: props.doctype,
+          reference_docname: props.doc || null,
+          ..._task.value,
+        },
       },
-    }, {
-      onError: (err) => {
-        if (err.error.exc_type == 'MandatoryError') {
-          error.value = "Title is mandatory"
-        }
-      }
-    })
+      {
+        onError: (err) => {
+          if (err.error.exc_type == 'MandatoryError') {
+            error.value = 'Title is mandatory'
+          }
+        },
+      },
+    )
     if (d.name) {
       updateOnboardingStep('create_first_task')
       capture('task_created')
diff --git a/frontend/src/components/SidePanelLayout.vue b/frontend/src/components/SidePanelLayout.vue
index aa42f49e..c8dcaaab 100644
--- a/frontend/src/components/SidePanelLayout.vue
+++ b/frontend/src/components/SidePanelLayout.vue
@@ -429,7 +429,7 @@ const emit = defineEmits(['afterFieldChange', 'reload'])
 const { getFormattedPercent, getFormattedFloat, getFormattedCurrency } =
   getMeta(props.doctype)
 
-const { isManager, getUser } = usersStore()
+const { users, isManager, getUser } = usersStore()
 
 const showSidePanelModal = ref(false)
 
@@ -471,8 +471,11 @@ function parsedField(field) {
   }
 
   if (field.fieldtype === 'Link' && field.options === 'User') {
-    field.options = field.options
     field.fieldtype = 'User'
+    field.link_filters = JSON.stringify({
+      ...(field.link_filters ? JSON.parse(field.link_filters) : {}),
+      name: ['in', users.data?.crmUsers?.map((user) => user.name)],
+    })
   }
 
   let _field = {
diff --git a/frontend/src/components/Telephony/TaskPanel.vue b/frontend/src/components/Telephony/TaskPanel.vue
index bf9641a5..28a9578c 100644
--- a/frontend/src/components/Telephony/TaskPanel.vue
+++ b/frontend/src/components/Telephony/TaskPanel.vue
@@ -45,6 +45,9 @@
         doctype="User"
         @change="(option) => (task.assigned_to = option)"
         :placeholder="__('John Doe')"
+        :filters="{
+          name: ['in', users.data?.crmUsers?.map((user) => user.name)],
+        }"
         :hideMe="true"
       >
         <template #prefix>
@@ -94,7 +97,7 @@ const props = defineProps({
   },
 })
 
-const { getUser } = usersStore()
+const { users, getUser } = usersStore()
 
 function updateTaskStatus(status) {
   props.task.status = status

From a485d8eb6e5754b207f0f5a5eb915ee651a9b6e9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 23 Jun 2025 12:51:01 +0530
Subject: [PATCH 47/51] fix: use change password modal in place

(cherry picked from commit 84d4327e8040a07653cc9bf1cc28639b89f9edbb)
---
 frontend/src/components/Settings/ProfileSettings.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index 2d7fc253..6ea134b6 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -66,6 +66,10 @@
           icon-left="lock"
           @click="showChangePasswordModal = true"
         />
+        <ChangePasswordModal
+          v-if="showChangePasswordModal"
+          v-model="showChangePasswordModal"
+        />
       </div>
       <div class="flex flex-col gap-4">
         <div class="flex justify-between gap-4">
@@ -97,10 +101,10 @@
   </div>
 </template>
 <script setup>
+import ChangePasswordModal from '@/components/Settings/ChangePasswordModal.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import { usersStore } from '@/stores/users'
 import { validateIsImageFile } from '@/utils'
-import { showChangePasswordModal } from '@/composables/modals'
 import {
   Dropdown,
   FileUploader,
@@ -116,6 +120,7 @@ const user = computed(() => getUser() || {})
 
 const profile = ref({})
 const error = ref('')
+const showChangePasswordModal = ref(false)
 
 const dirty = computed(() => {
   return (

From f0b295a907e6ae9ddf33e8e8797e211aa7c7435a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 23 Jun 2025 13:11:55 +0530
Subject: [PATCH 48/51] fix: renaming fix and removed CRM User code

(cherry picked from commit cf1fce3dc0334ec728798f47cc2537726f4dc6ea)
---
 crm/api/user.py                                      | 2 +-
 crm/fcrm/doctype/crm_invitation/crm_invitation.py    | 8 --------
 frontend/src/components/Layouts/AppSidebar.vue       | 2 +-
 frontend/src/components/Settings/ProfileSettings.vue | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/crm/api/user.py b/crm/api/user.py
index 7eef6d50..caae05f3 100644
--- a/crm/api/user.py
+++ b/crm/api/user.py
@@ -4,7 +4,7 @@ import frappe
 @frappe.whitelist()
 def add_existing_users(users, role="Sales User"):
 	"""
-	Add existing users to the CRM User doctype.
+	Add existing users to the CRM by assigning them a role (Sales User or Sales Manager).
 	:param users: List of user names to be added
 	"""
 	frappe.only_for(["System Manager", "Sales Manager"])
diff --git a/crm/fcrm/doctype/crm_invitation/crm_invitation.py b/crm/fcrm/doctype/crm_invitation/crm_invitation.py
index 9b07cd53..965bf4d7 100644
--- a/crm/fcrm/doctype/crm_invitation/crm_invitation.py
+++ b/crm/fcrm/doctype/crm_invitation/crm_invitation.py
@@ -52,14 +52,6 @@ class CRMInvitation(Document):
 		self.accepted_at = frappe.utils.now()
 		self.save(ignore_permissions=True)
 
-		# create CRM User record
-		if not frappe.db.exists("CRM User", {"user": user.name}):
-			crm_user = frappe.get_doc(
-				doctype="CRM User",
-				user=user.name,
-			)
-			crm_user.insert(ignore_permissions=True)
-
 	def update_module_in_user(self, user, module):
 		block_modules = frappe.get_all(
 			"Module Def",
diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index f97b645d..629ceb4f 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -529,7 +529,7 @@ const articles = ref([
       { name: 'profile', title: __('Profile') },
       { name: 'custom-branding', title: __('Custom branding') },
       { name: 'home-actions', title: __('Home actions') },
-      { name: 'invite-agent', title: __('Invite agent') },
+      { name: 'invite-users', title: __('Invite users') },
     ],
   },
   {
diff --git a/frontend/src/components/Settings/ProfileSettings.vue b/frontend/src/components/Settings/ProfileSettings.vue
index 6ea134b6..8ddd496b 100644
--- a/frontend/src/components/Settings/ProfileSettings.vue
+++ b/frontend/src/components/Settings/ProfileSettings.vue
@@ -101,7 +101,7 @@
   </div>
 </template>
 <script setup>
-import ChangePasswordModal from '@/components/Settings/ChangePasswordModal.vue'
+import ChangePasswordModal from '@/components/Modals/ChangePasswordModal.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import { usersStore } from '@/stores/users'
 import { validateIsImageFile } from '@/utils'

From d9555f62f832c22e7d9c5a3e953d4e3ff9147a6c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Mon, 23 Jun 2025 13:27:15 +0530
Subject: [PATCH 49/51] chore: resolved conflict

---
 crm/api/__init__.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/crm/api/__init__.py b/crm/api/__init__.py
index 759bdab0..e0b98221 100644
--- a/crm/api/__init__.py
+++ b/crm/api/__init__.py
@@ -98,15 +98,11 @@ def accept_invitation(key: str | None = None):
 
 @frappe.whitelist()
 def invite_by_email(emails: str, role: str):
-<<<<<<< HEAD
-	frappe.only_for("Sales Manager")
-=======
 	frappe.only_for(["Sales Manager", "System Manager"])
 
 	if role not in ["System Manager", "Sales Manager", "Sales User"]:
 		frappe.throw("Cannot invite for this role")
 
->>>>>>> 03abe0b5 (fix: create crm user on accepting invite)
 	if not emails:
 		return
 	email_string = validate_email_address(emails, throw=False)

From fbbcae7049c7016dfa30ee55c4be7d42439ed17c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Mon, 23 Jun 2025 13:30:44 +0530
Subject: [PATCH 50/51] chore: resolved conflict

---
 frontend/components.d.ts | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index cd05f733..6a8cbbaf 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -154,30 +154,9 @@ declare module 'vue' {
     ListIcon: typeof import('./src/components/Icons/ListIcon.vue')['default']
     ListRows: typeof import('./src/components/ListViews/ListRows.vue')['default']
     LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default']
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    LucideInfo: typeof import('~icons/lucide/info')['default']
->>>>>>> fad7c598 (refactor: profile page)
-    LucidePlus: typeof import('~icons/lucide/plus')['default']
-=======
->>>>>>> dd122930 (fix: updated components.d.ts)
-=======
-=======
-    LucideCalendar: typeof import('~icons/lucide/calendar')['default']
->>>>>>> efd03141 (chore: resolved conflict)
     LucideInfo: typeof import('~icons/lucide/info')['default']
     LucidePlus: typeof import('~icons/lucide/plus')['default']
     LucideSearch: typeof import('~icons/lucide/search')['default']
->>>>>>> 56425254 (fix: updated components.d.ts)
-=======
-    LucideInfo: typeof import('~icons/lucide/info')['default']
-    LucidePlus: typeof import('~icons/lucide/plus')['default']
-    LucideSearch: typeof import('~icons/lucide/search')['default']
->>>>>>> 4c7269e3 (fix: updated components.d.ts)
     MarkAsDoneIcon: typeof import('./src/components/Icons/MarkAsDoneIcon.vue')['default']
     MaximizeIcon: typeof import('./src/components/Icons/MaximizeIcon.vue')['default']
     MenuIcon: typeof import('./src/components/Icons/MenuIcon.vue')['default']

From 236a5026e3eb877a5f68e5aba2b7356534f7c260 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Mon, 23 Jun 2025 13:36:50 +0530
Subject: [PATCH 51/51] chore: resolved conflict

---
 .../Settings/ProfileImageEditor.vue           | 75 -------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 frontend/src/components/Settings/ProfileImageEditor.vue

diff --git a/frontend/src/components/Settings/ProfileImageEditor.vue b/frontend/src/components/Settings/ProfileImageEditor.vue
deleted file mode 100644
index 07c1fc3a..00000000
--- a/frontend/src/components/Settings/ProfileImageEditor.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <FileUploader
-    @success="(file) => setUserImage(file.file_url)"
-<<<<<<< HEAD
-    :validateFile="validateIsImageFile"
-=======
-    :validateFile="validateFile"
->>>>>>> 675bcb54 (Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue)
-  >
-    <template v-slot="{ file, progress, error, uploading, openFileSelector }">
-      <div class="flex flex-col items-center">
-        <button
-          class="group relative rounded-full border-2"
-          @click="openFileSelector"
-        >
-          <div
-            class="absolute inset-0 grid place-items-center rounded-full bg-gray-400/20 text-base text-ink-gray-5 transition-opacity"
-            :class="[
-              uploading ? 'opacity-100' : 'opacity-0 group-hover:opacity-100',
-              'drop-shadow-sm',
-            ]"
-          >
-            <span
-              class="inline-block rounded-md bg-surface-gray-7/60 px-2 py-1 text-ink-white"
-            >
-              {{
-                uploading
-                  ? `Uploading ${progress}%`
-                  : profile.user_image
-                  ? 'Change Image'
-                  : 'Upload Image'
-              }}
-            </span>
-          </div>
-          <img
-            v-if="profile.user_image"
-            class="h-64 w-64 rounded-full object-cover"
-            :src="profile.user_image"
-            alt="Profile Photo"
-          />
-          <div v-else class="h-64 w-64 rounded-full bg-surface-gray-2"></div>
-        </button>
-        <ErrorMessage class="mt-4" :message="error" />
-        <div class="mt-4 flex items-center gap-4">
-          <Button v-if="profile.user_image" @click="setUserImage(null)">
-            Remove
-          </Button>
-        </div>
-      </div>
-    </template>
-  </FileUploader>
-</template>
-<script setup>
-import { FileUploader } from 'frappe-ui'
-<<<<<<< HEAD
-import { validateIsImageFile } from '@/utils';
-=======
->>>>>>> 675bcb54 (Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue)
-
-const profile = defineModel()
-
-function setUserImage(url) {
-  profile.value.user_image = url
-}
-<<<<<<< HEAD
-=======
-
-function validateFile(file) {
-  let extn = file.name.split('.').pop().toLowerCase()
-  if (!['png', 'jpg'].includes(extn)) {
-    return 'Only PNG and JPG images are allowed'
-  }
-}
->>>>>>> 675bcb54 (Discard changes to frontend/src/components/Settings/ProfileImageEditor.vue)
-</script>