From d193c05c96b19c7588c7f539f8913628a994503c Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 19 Jan 2024 20:47:00 +0530
Subject: [PATCH 1/5] fix: load public views

---
 crm/api/doc.py                                | 10 ++----
 crm/api/views.py                              | 19 +++++++++++
 .../crm_view_settings/crm_view_settings.json  |  9 +++++-
 frontend/src/stores/views.js                  | 32 +++++++++++--------
 4 files changed, 48 insertions(+), 22 deletions(-)
 create mode 100644 crm/api/views.py

diff --git a/crm/api/doc.py b/crm/api/doc.py
index 461cac1d..4ad990c1 100644
--- a/crm/api/doc.py
+++ b/crm/api/doc.py
@@ -3,6 +3,8 @@ from frappe.model.document import get_controller
 from frappe.model import no_value_fields
 from pypika import Criterion
 
+from crm.api.views import get_views
+
 
 @frappe.whitelist()
 def sort_options(doctype: str):
@@ -164,14 +166,6 @@ def get_list_data(
 		"row_count": len(data),
 	}
 
-def get_views(doctype):
-	views = frappe.get_all(
-		"CRM View Settings",
-		fields=["*"],
-		filters={"dt": doctype, "user": frappe.session.user}
-	)
-	return views
-
 
 def get_doctype_fields(doctype):
 	not_allowed_fieldtypes = [
diff --git a/crm/api/views.py b/crm/api/views.py
new file mode 100644
index 00000000..6a95adbf
--- /dev/null
+++ b/crm/api/views.py
@@ -0,0 +1,19 @@
+import frappe
+from pypika import Criterion
+
+
+@frappe.whitelist()
+def get_views(doctype):
+	if frappe.session.user == "Guest":
+		frappe.throw("Authentication failed", exc=frappe.AuthenticationError)
+
+	View = frappe.qb.DocType("CRM View Settings")
+	query = (
+		frappe.qb.from_(View)
+		.select("*")
+		.where(Criterion.any([View.user == '', View.user == frappe.session.user]))
+	)
+	if doctype:
+		query = query.where(View.dt == doctype)
+	views = query.run(as_dict=True)
+	return views
\ No newline at end of file
diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
index 6cbc383e..8671e0ad 100644
--- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
+++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
@@ -11,6 +11,7 @@
   "dt",
   "route_name",
   "pinned",
+  "public",
   "columns_tab",
   "load_default_columns",
   "columns",
@@ -97,11 +98,17 @@
    "fieldname": "load_default_columns",
    "fieldtype": "Check",
    "label": "Load Default Columns"
+  },
+  {
+   "default": "0",
+   "fieldname": "public",
+   "fieldtype": "Check",
+   "label": "Public"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-03 16:54:52.195687",
+ "modified": "2024-01-19 19:55:14.876998",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM View Settings",
diff --git a/frontend/src/stores/views.js b/frontend/src/stores/views.js
index a88cc7c9..7db007f9 100644
--- a/frontend/src/stores/views.js
+++ b/frontend/src/stores/views.js
@@ -1,29 +1,30 @@
 import { defineStore } from 'pinia'
-import { usersStore } from '@/stores/users'
-import { createListResource } from 'frappe-ui'
+import { createResource } from 'frappe-ui'
 import { reactive, ref } from 'vue'
 
-export const viewsStore = defineStore('crm-views', () => {
-
-  const { getUser } = usersStore()
-
+export const viewsStore = defineStore('crm-views', (doctype) => {
   let viewsByName = reactive({})
   let pinnedViews = ref([])
+  let publicViews = ref([])
 
-  const views = createListResource({
-    doctype: 'CRM View Settings',
-    fields: ['*'],
-    filters: { user: getUser().email },
-    cache: 'crm-views',
+  // Views
+  const views = createResource({
+    url: 'crm.api.views.get_views',
+    params: { doctype: doctype || '' },
+    cache: "crm-views",
     initialData: [],
     auto: true,
     transform(views) {
       pinnedViews.value = []
+      publicViews.value = []
       for (let view of views) {
         viewsByName[view.name] = view
         if (view.pinned) {
           pinnedViews.value?.push(view)
         }
+        if (view.public) {
+          publicViews.value?.push(view)
+        }
       }
       return views
     },
@@ -42,13 +43,18 @@ export const viewsStore = defineStore('crm-views', () => {
     return pinnedViews.value
   }
 
-  async function reload(wait = false) {
+  function getPublicViews() {
+    if (!publicViews.value?.length) return []
+    return publicViews.value
+  }
+
+  async function reload() {
     await views.reload()
   }
 
   return {
-    views,
     getPinnedViews,
+    getPublicViews,
     reload,
     getView,
   }

From bea64d4ec02f17019cf608a164cd1d7b94e10c41 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 19 Jan 2024 20:48:20 +0530
Subject: [PATCH 2/5] fix: show public views in sidebar

---
 .../src/components/Layouts/AppSidebar.vue     | 55 ++++++++++++++-----
 1 file changed, 42 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/Layouts/AppSidebar.vue b/frontend/src/components/Layouts/AppSidebar.vue
index 4b5d891d..5b1cd6e6 100644
--- a/frontend/src/components/Layouts/AppSidebar.vue
+++ b/frontend/src/components/Layouts/AppSidebar.vue
@@ -15,25 +15,54 @@
           class="mx-2 my-0.5"
         />
       </div>
+      <div
+        v-if="isSidebarCollapsed && getPublicViews().length"
+        class="mx-2 my-2 h-1 border-b"
+      />
+      <div
+        v-if="getPublicViews().length"
+        class="px-3 text-base text-gray-600 transition-all duration-300 ease-in-out"
+        :class="
+          isSidebarCollapsed
+            ? 'ml-0 h-0 overflow-hidden opacity-0'
+            : 'ml-2 h-7 w-auto opacity-100 mt-4'
+        "
+      >
+        Public Views
+      </div>
+      <div v-if="getPublicViews().length" class="flex flex-col overflow-y-auto">
+        <SidebarLink
+          v-for="publicView in getPublicViews()"
+          :icon="
+            h(getIcon(publicView.route_name), {
+              class: 'h-4.5 w-4.5 text-gray-700',
+            })
+          "
+          :label="publicView.label"
+          :to="{
+            name: publicView.route_name,
+            query: { view: publicView.name },
+          }"
+          :isCollapsed="isSidebarCollapsed"
+          class="mx-2 my-0.5"
+        />
+      </div>
       <div
         v-if="isSidebarCollapsed && getPinnedViews().length"
         class="mx-2 my-2 h-1 border-b"
       />
       <div
         v-if="getPinnedViews().length"
-        class="flex flex-col overflow-y-auto"
-        :class="isSidebarCollapsed ? 'mt-0' : 'mt-4'"
+        class="px-3 text-base text-gray-600 transition-all duration-300 ease-in-out"
+        :class="
+          isSidebarCollapsed
+            ? 'ml-0 h-0 overflow-hidden opacity-0'
+            : 'ml-2 h-7 w-auto opacity-100 mt-4'
+        "
       >
-        <div
-          class="h-7 px-3 text-base text-gray-600 transition-all duration-300 ease-in-out"
-          :class="
-            isSidebarCollapsed
-              ? 'ml-0 h-0 overflow-hidden opacity-0'
-              : 'ml-2 w-auto opacity-100'
-          "
-        >
-          Pinned Views
-        </div>
+        Pinned Views
+      </div>
+      <div v-if="getPinnedViews().length" class="flex flex-col overflow-y-auto">
         <SidebarLink
           v-for="pinnedView in getPinnedViews()"
           :icon="
@@ -84,7 +113,7 @@ import { viewsStore } from '@/stores/views'
 import { useStorage } from '@vueuse/core'
 import { h } from 'vue'
 
-const { getPinnedViews } = viewsStore()
+const { getPinnedViews, getPublicViews } = viewsStore()
 
 const links = [
   {

From dfc78b16e8ba4e68e3dc2236595488e456e2bb08 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 19 Jan 2024 20:48:37 +0530
Subject: [PATCH 3/5] fix: show public views section in list view dropdown

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

diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue
index 2566f956..3df9d573 100644
--- a/frontend/src/components/ViewControls.vue
+++ b/frontend/src/components/ViewControls.vue
@@ -249,9 +249,16 @@ const viewsDropdownOptions = computed(() => {
         router.push({ ...route, query: { view: view.name } })
       }
     })
-    let savedViews = list.value.data.views.filter((v) => !v.pinned)
+    let publicViews = list.value.data.views.filter((v) => v.public)
+    let savedViews = list.value.data.views.filter((v) => !v.pinned && !v.public)
     let pinnedViews = list.value.data.views.filter((v) => v.pinned)
 
+    publicViews.length &&
+      _views.push({
+        group: 'Public Views',
+        items: publicViews,
+      })
+
     savedViews.length &&
       _views.push({
         group: 'Saved Views',

From 0d49fa4737f5a48060e9df92041a8216022f61a5 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 19 Jan 2024 22:00:02 +0530
Subject: [PATCH 4/5] fix: only allow sales manager to create and update public
 views

---
 crm/api/session.py                            |  4 +++
 .../crm_view_settings/crm_view_settings.py    | 10 ++++++
 frontend/src/components/ViewControls.vue      | 36 +++++++++++++++++--
 frontend/src/stores/users.js                  |  5 +++
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/crm/api/session.py b/crm/api/session.py
index 7650d3c1..b9435b16 100644
--- a/crm/api/session.py
+++ b/crm/api/session.py
@@ -16,6 +16,10 @@ def get_users():
 	for user in 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"
+		)
 	return users
 
 @frappe.whitelist()
diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
index 5eba8b6e..19e0ab04 100644
--- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
+++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.py
@@ -63,6 +63,16 @@ def delete(name):
 	if frappe.db.exists("CRM View Settings", name):
 		frappe.delete_doc("CRM View Settings", name)
 
+@frappe.whitelist()
+def public(name, value):
+	if "Sales Manager" not in frappe.get_roles() or frappe.session.user != "Administrator":
+		frappe.throw("Not permitted", frappe.PermissionError)
+
+	doc = frappe.get_doc("CRM View Settings", name)
+	doc.public = value
+	doc.user = "" if value else frappe.session.user
+	doc.save()
+
 @frappe.whitelist()
 def pin(name, value):
 	doc = frappe.get_doc("CRM View Settings", name)
diff --git a/frontend/src/components/ViewControls.vue b/frontend/src/components/ViewControls.vue
index 3df9d573..5083aaf0 100644
--- a/frontend/src/components/ViewControls.vue
+++ b/frontend/src/components/ViewControls.vue
@@ -18,7 +18,10 @@
       </Dropdown>
     </div>
     <div class="flex items-center gap-2">
-      <div v-if="viewUpdated" class="flex items-center gap-2 border-r pr-2">
+      <div
+        v-if="viewUpdated && (!view.public || isManager())"
+        class="flex items-center gap-2 border-r pr-2"
+      >
         <Button label="Cancel" @click="cancelChanges" />
         <Button
           :label="view?.name ? 'Save Changes' : 'Create View'"
@@ -76,8 +79,9 @@ import Filter from '@/components/Filter.vue'
 import ColumnSettings from '@/components/ColumnSettings.vue'
 import { globalStore } from '@/stores/global'
 import { viewsStore } from '@/stores/views'
+import { usersStore } from '@/stores/users'
 import { useDebounceFn } from '@vueuse/core'
-import { createResource, Dropdown, call } from 'frappe-ui'
+import { createResource, Dropdown, call, FeatherIcon } from 'frappe-ui'
 import { computed, ref, defineModel, onMounted, watch, h } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 
@@ -94,6 +98,7 @@ const props = defineProps({
 
 const { $dialog } = globalStore()
 const { reload: reloadView, getView } = viewsStore()
+const { isManager } = usersStore()
 
 const list = defineModel()
 const loadMore = defineModel('loadMore')
@@ -123,6 +128,7 @@ const view = ref({
   rows: '',
   load_default_columns: false,
   pinned: false,
+  public: false,
 })
 
 const pageLength = computed(() => list.value?.data?.page_length)
@@ -159,6 +165,7 @@ function getParams() {
       route_name: _view.route_name,
       load_default_columns: _view.row,
       pinned: _view.pinned,
+      public: _view.public,
     }
   } else {
     view.value = {
@@ -171,6 +178,7 @@ function getParams() {
       route_name: '',
       load_default_columns: true,
       pinned: false,
+      public: false,
     }
   }
 
@@ -345,7 +353,7 @@ const viewActions = computed(() => {
     },
   ]
 
-  if (route.query.view) {
+  if (route.query.view && (!view.value.public || isManager())) {
     actions[0].items.push(
       {
         label: 'Rename',
@@ -360,6 +368,18 @@ const viewActions = computed(() => {
       }
     )
 
+    if (route.query.view && isManager()) {
+      actions[0].items.push({
+        label: view.value.public ? 'Make Private' : 'Make Public',
+        icon: () =>
+          h(FeatherIcon, {
+            name: view.value.public ? 'lock' : 'unlock',
+            class: 'h-4 w-4',
+          }),
+        onClick: () => publicView(),
+      })
+    }
+
     actions.push({
       group: 'Delete View',
       hideLabel: true,
@@ -400,6 +420,16 @@ function renameView() {
   showViewModal.value = true
 }
 
+function publicView() {
+  call('crm.fcrm.doctype.crm_view_settings.crm_view_settings.public', {
+    name: route.query.view,
+    value: !view.value.public,
+  }).then(() => {
+    view.value.public = !view.value.public
+    reloadView()
+  })
+}
+
 function pinView() {
   call('crm.fcrm.doctype.crm_view_settings.crm_view_settings.pin', {
     name: route.query.view,
diff --git a/frontend/src/stores/users.js b/frontend/src/stores/users.js
index 8225d596..5c933078 100644
--- a/frontend/src/stores/users.js
+++ b/frontend/src/stores/users.js
@@ -42,8 +42,13 @@ export const usersStore = defineStore('crm-users', () => {
     return usersByName[email]
   }
 
+  function isManager(email) {
+    return getUser(email).is_manager
+  }
+
   return {
     users,
     getUser,
+    isManager,
   }
 })

From 9a4a78e1e3bc5c1615b270c36b0cc9cb34c14ae1 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 19 Jan 2024 22:00:39 +0530
Subject: [PATCH 5/5] fix: added sales user & sales manager role to all
 doctypes

---
 .../doctype/crm_call_log/crm_call_log.json    | 16 +++++++++++++--
 .../crm_communication_status.json             | 16 +++++++++++++--
 crm/fcrm/doctype/crm_deal/crm_deal.json       | 16 +++++++++++++--
 .../crm_deal_status/crm_deal_status.json      | 16 +++++++++++++--
 .../crm_form_script/crm_form_script.json      |  4 ++--
 .../crm_holiday_list/crm_holiday_list.json    | 16 +++++++++++++--
 .../doctype/crm_industry/crm_industry.json    | 16 +++++++++++++--
 crm/fcrm/doctype/crm_lead/crm_lead.json       | 16 +++++++++++++--
 .../crm_lead_source/crm_lead_source.json      | 16 +++++++++++++--
 .../crm_lead_status/crm_lead_status.json      | 16 +++++++++++++--
 crm/fcrm/doctype/crm_note/crm_note.json       | 16 +++++++++++++--
 .../crm_organization/crm_organization.json    | 16 +++++++++++++--
 .../crm_service_level_agreement.json          |  4 ++--
 crm/fcrm/doctype/crm_task/crm_task.json       | 16 +++++++++++++--
 .../doctype/crm_territory/crm_territory.json  | 20 +++++++++++++++----
 .../crm_view_settings/crm_view_settings.json  | 16 +++++++++++++--
 .../doctype/twilio_agents/twilio_agents.json  |  4 ++--
 17 files changed, 204 insertions(+), 36 deletions(-)

diff --git a/crm/fcrm/doctype/crm_call_log/crm_call_log.json b/crm/fcrm/doctype/crm_call_log/crm_call_log.json
index cf7f3a1c..6cb6191c 100644
--- a/crm/fcrm/doctype/crm_call_log/crm_call_log.json
+++ b/crm/fcrm/doctype/crm_call_log/crm_call_log.json
@@ -127,7 +127,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-18 13:27:19.776926",
+ "modified": "2024-01-19 21:51:52.173476",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Call Log",
@@ -142,7 +142,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_communication_status/crm_communication_status.json b/crm/fcrm/doctype/crm_communication_status/crm_communication_status.json
index be7aeb93..ff3163e9 100644
--- a/crm/fcrm/doctype/crm_communication_status/crm_communication_status.json
+++ b/crm/fcrm/doctype/crm_communication_status/crm_communication_status.json
@@ -20,7 +20,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-12-13 13:28:38.746199",
+ "modified": "2024-01-19 21:55:17.952032",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Communication Status",
@@ -35,7 +35,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
index 12115e15..c8b497a7 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.json
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -275,7 +275,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-19 17:13:41.931398",
+ "modified": "2024-01-19 21:43:58.940722",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",
@@ -290,7 +290,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_deal_status/crm_deal_status.json b/crm/fcrm/doctype/crm_deal_status/crm_deal_status.json
index d683bf68..b0374ca1 100644
--- a/crm/fcrm/doctype/crm_deal_status/crm_deal_status.json
+++ b/crm/fcrm/doctype/crm_deal_status/crm_deal_status.json
@@ -36,7 +36,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-29 12:52:03.070218",
+ "modified": "2024-01-19 21:56:44.552134",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal Status",
@@ -51,7 +51,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_form_script/crm_form_script.json b/crm/fcrm/doctype/crm_form_script/crm_form_script.json
index dccf506c..b883e804 100644
--- a/crm/fcrm/doctype/crm_form_script/crm_form_script.json
+++ b/crm/fcrm/doctype/crm_form_script/crm_form_script.json
@@ -45,7 +45,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-12-29 12:14:45.706725",
+ "modified": "2024-01-19 21:52:46.078626",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Form Script",
@@ -60,7 +60,7 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales Manager",
    "share": 1,
    "write": 1
   }
diff --git a/crm/fcrm/doctype/crm_holiday_list/crm_holiday_list.json b/crm/fcrm/doctype/crm_holiday_list/crm_holiday_list.json
index a6a8ab6b..066f12ee 100644
--- a/crm/fcrm/doctype/crm_holiday_list/crm_holiday_list.json
+++ b/crm/fcrm/doctype/crm_holiday_list/crm_holiday_list.json
@@ -85,7 +85,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-12-14 11:18:27.236817",
+ "modified": "2024-01-19 21:54:54.809445",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Holiday List",
@@ -100,7 +100,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_industry/crm_industry.json b/crm/fcrm/doctype/crm_industry/crm_industry.json
index 9523cca4..d3d15a71 100644
--- a/crm/fcrm/doctype/crm_industry/crm_industry.json
+++ b/crm/fcrm/doctype/crm_industry/crm_industry.json
@@ -21,7 +21,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-07-24 19:40:31.980882",
+ "modified": "2024-01-19 21:57:02.025918",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Industry",
@@ -36,7 +36,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_lead/crm_lead.json b/crm/fcrm/doctype/crm_lead/crm_lead.json
index 3f61682c..ba851add 100644
--- a/crm/fcrm/doctype/crm_lead/crm_lead.json
+++ b/crm/fcrm/doctype/crm_lead/crm_lead.json
@@ -293,7 +293,7 @@
  "image_field": "image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-06 18:44:03.946528",
+ "modified": "2024-01-19 21:52:28.923346",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Lead",
@@ -308,7 +308,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_lead_source/crm_lead_source.json b/crm/fcrm/doctype/crm_lead_source/crm_lead_source.json
index 0d0f120b..23aea6f6 100644
--- a/crm/fcrm/doctype/crm_lead_source/crm_lead_source.json
+++ b/crm/fcrm/doctype/crm_lead_source/crm_lead_source.json
@@ -29,7 +29,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-23 13:11:40.743731",
+ "modified": "2024-01-19 21:56:04.702254",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Lead Source",
@@ -44,7 +44,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_lead_status/crm_lead_status.json b/crm/fcrm/doctype/crm_lead_status/crm_lead_status.json
index a13281ba..587f6b61 100644
--- a/crm/fcrm/doctype/crm_lead_status/crm_lead_status.json
+++ b/crm/fcrm/doctype/crm_lead_status/crm_lead_status.json
@@ -37,7 +37,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-29 12:52:25.641581",
+ "modified": "2024-01-19 21:56:16.872924",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Lead Status",
@@ -52,7 +52,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_note/crm_note.json b/crm/fcrm/doctype/crm_note/crm_note.json
index faa95bd8..3726bdd2 100644
--- a/crm/fcrm/doctype/crm_note/crm_note.json
+++ b/crm/fcrm/doctype/crm_note/crm_note.json
@@ -49,7 +49,7 @@
    "link_fieldname": "note"
   }
  ],
- "modified": "2023-11-23 13:11:39.812793",
+ "modified": "2024-01-19 21:56:30.123334",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Note",
@@ -63,7 +63,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_organization/crm_organization.json b/crm/fcrm/doctype/crm_organization/crm_organization.json
index 1b300b94..bc1a042c 100644
--- a/crm/fcrm/doctype/crm_organization/crm_organization.json
+++ b/crm/fcrm/doctype/crm_organization/crm_organization.json
@@ -65,7 +65,7 @@
  "image_field": "organization_logo",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-04 18:57:52.519305",
+ "modified": "2024-01-19 21:53:14.945857",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Organization",
@@ -80,7 +80,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.json b/crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.json
index e563ccea..81fe90c9 100644
--- a/crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.json
+++ b/crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.json
@@ -115,7 +115,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-12-15 11:50:29.956775",
+ "modified": "2024-01-19 21:54:25.831753",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Service Level Agreement",
@@ -130,7 +130,7 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales Manager",
    "share": 1,
    "write": 1
   }
diff --git a/crm/fcrm/doctype/crm_task/crm_task.json b/crm/fcrm/doctype/crm_task/crm_task.json
index 8525439c..bb962714 100644
--- a/crm/fcrm/doctype/crm_task/crm_task.json
+++ b/crm/fcrm/doctype/crm_task/crm_task.json
@@ -87,7 +87,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-23 13:11:39.233502",
+ "modified": "2024-01-19 21:55:42.654547",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Task",
@@ -102,7 +102,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_territory/crm_territory.json b/crm/fcrm/doctype/crm_territory/crm_territory.json
index 09d96e75..91e3b09c 100644
--- a/crm/fcrm/doctype/crm_territory/crm_territory.json
+++ b/crm/fcrm/doctype/crm_territory/crm_territory.json
@@ -13,10 +13,10 @@
   "section_break_qhaf",
   "old_parent",
   "parent_crm_territory",
-  "is_group",
   "column_break_pypy",
   "lft",
-  "rgt"
+  "rgt",
+  "is_group"
  ],
  "fields": [
   {
@@ -90,7 +90,7 @@
  "index_web_pages_for_search": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2024-01-05 12:26:25.485080",
+ "modified": "2024-01-19 21:53:53.451891",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Territory",
@@ -106,7 +106,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
index 8671e0ad..d4574d55 100644
--- a/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
+++ b/crm/fcrm/doctype/crm_view_settings/crm_view_settings.json
@@ -108,7 +108,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-19 19:55:14.876998",
+ "modified": "2024-01-19 21:44:52.285420",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM View Settings",
@@ -123,7 +123,19 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales User",
+   "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
   }
diff --git a/crm/fcrm/doctype/twilio_agents/twilio_agents.json b/crm/fcrm/doctype/twilio_agents/twilio_agents.json
index c54aaf36..65251130 100644
--- a/crm/fcrm/doctype/twilio_agents/twilio_agents.json
+++ b/crm/fcrm/doctype/twilio_agents/twilio_agents.json
@@ -51,7 +51,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-17 22:21:00.606384",
+ "modified": "2024-01-19 21:57:18.626669",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "Twilio Agents",
@@ -66,7 +66,7 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
+   "role": "Sales Manager",
    "share": 1,
    "write": 1
   }