From 2c53932522214637b7d5a38d90c63a51f546d0f6 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 18:25:02 +0530
Subject: [PATCH 01/17] fix: created deal doctype

---
 crm/fcrm/doctype/crm_deal/__init__.py      |   0
 crm/fcrm/doctype/crm_deal/crm_deal.js      |   8 ++
 crm/fcrm/doctype/crm_deal/crm_deal.json    | 123 +++++++++++++++++++++
 crm/fcrm/doctype/crm_deal/crm_deal.py      |   9 ++
 crm/fcrm/doctype/crm_deal/test_crm_deal.py |   9 ++
 5 files changed, 149 insertions(+)
 create mode 100644 crm/fcrm/doctype/crm_deal/__init__.py
 create mode 100644 crm/fcrm/doctype/crm_deal/crm_deal.js
 create mode 100644 crm/fcrm/doctype/crm_deal/crm_deal.json
 create mode 100644 crm/fcrm/doctype/crm_deal/crm_deal.py
 create mode 100644 crm/fcrm/doctype/crm_deal/test_crm_deal.py

diff --git a/crm/fcrm/doctype/crm_deal/__init__.py b/crm/fcrm/doctype/crm_deal/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.js b/crm/fcrm/doctype/crm_deal/crm_deal.js
new file mode 100644
index 000000000..1b305ae09
--- /dev/null
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("CRM Deal", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
new file mode 100644
index 000000000..30f9e7c44
--- /dev/null
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -0,0 +1,123 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "naming_series:",
+ "creation": "2023-11-06 17:56:25.210449",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "naming_series",
+  "organization",
+  "website",
+  "annual_revenue",
+  "column_break_afce",
+  "deal_owner",
+  "close_date",
+  "deal_status",
+  "probability",
+  "next_step",
+  "section_break_eepu",
+  "lead",
+  "column_break_bqvs"
+ ],
+ "fields": [
+  {
+   "fieldname": "organization",
+   "fieldtype": "Link",
+   "label": "Organization",
+   "options": "CRM Organization"
+  },
+  {
+   "fieldname": "probability",
+   "fieldtype": "Percent",
+   "label": "Probability"
+  },
+  {
+   "fetch_from": "organization.annual_revenue",
+   "fieldname": "annual_revenue",
+   "fieldtype": "Int",
+   "label": "Annual Revenue"
+  },
+  {
+   "fieldname": "column_break_afce",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fetch_from": "organization.website",
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "label": "Website",
+   "options": "URL"
+  },
+  {
+   "fieldname": "close_date",
+   "fieldtype": "Date",
+   "label": "Close Date"
+  },
+  {
+   "fieldname": "next_step",
+   "fieldtype": "Data",
+   "label": "Next Step"
+  },
+  {
+   "fieldname": "lead",
+   "fieldtype": "Link",
+   "label": "Lead",
+   "options": "CRM Lead"
+  },
+  {
+   "fieldname": "section_break_eepu",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_bqvs",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "deal_owner",
+   "fieldtype": "Link",
+   "label": "Deal Owner",
+   "options": "User"
+  },
+  {
+   "default": "Qualification",
+   "fieldname": "deal_status",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Deal Status",
+   "options": "Qualification\nDemo/Making\nProposal/Quotation\nNegotiation\nReady to Close\nWon\nLost",
+   "reqd": 1,
+   "search_index": 1
+  },
+  {
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Naming Series",
+   "options": "CRM-DEAL-.YYYY.-"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2023-11-06 18:07:22.815164",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Deal",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.py b/crm/fcrm/doctype/crm_deal/crm_deal.py
new file mode 100644
index 000000000..f36b1cf9c
--- /dev/null
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class CRMDeal(Document):
+	pass
diff --git a/crm/fcrm/doctype/crm_deal/test_crm_deal.py b/crm/fcrm/doctype/crm_deal/test_crm_deal.py
new file mode 100644
index 000000000..b9ecc378a
--- /dev/null
+++ b/crm/fcrm/doctype/crm_deal/test_crm_deal.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests.utils import FrappeTestCase
+
+
+class TestCRMDeal(FrappeTestCase):
+	pass

From 5b4cb4cd7f52ef3d423e1f99a94d460249897d3e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:01:20 +0530
Subject: [PATCH 02/17] chore: moved contactModal in modals folder

---
 frontend/src/components/{ => Modals}/ContactModal.vue | 0
 frontend/src/pages/Contact.vue                        | 8 --------
 frontend/src/pages/Contacts.vue                       | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)
 rename frontend/src/components/{ => Modals}/ContactModal.vue (100%)

diff --git a/frontend/src/components/ContactModal.vue b/frontend/src/components/Modals/ContactModal.vue
similarity index 100%
rename from frontend/src/components/ContactModal.vue
rename to frontend/src/components/Modals/ContactModal.vue
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index 1c19f6543..245458a40 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -174,11 +174,6 @@
       </template>
     </Tabs>
   </div>
-  <ContactModal
-    v-model="showContactModal"
-    v-model:reloadContacts="contacts"
-    :contact="contact"
-  />
 </template>
 
 <script setup>
@@ -197,7 +192,6 @@ import {
   createListResource,
 } from 'frappe-ui'
 import LayoutHeader from '@/components/LayoutHeader.vue'
-import ContactModal from '@/components/ContactModal.vue'
 import PhoneIcon from '@/components/Icons/PhoneIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import LeadsIcon from '@/components/Icons/LeadsIcon.vue'
@@ -223,8 +217,6 @@ const { getContactByName, contacts } = contactsStore()
 const { getUser } = usersStore()
 const { getOrganization, getOrganizationOptions } = organizationsStore()
 
-const showContactModal = ref(false)
-
 const props = defineProps({
   contactId: {
     type: String,
diff --git a/frontend/src/pages/Contacts.vue b/frontend/src/pages/Contacts.vue
index 5c581f9db..bbbfc8193 100644
--- a/frontend/src/pages/Contacts.vue
+++ b/frontend/src/pages/Contacts.vue
@@ -43,7 +43,7 @@
 
 <script setup>
 import LayoutHeader from '@/components/LayoutHeader.vue'
-import ContactModal from '@/components/ContactModal.vue'
+import ContactModal from '@/components/Modals/ContactModal.vue'
 import ContactsListView from '@/components/ListViews/ContactsListView.vue'
 import SortBy from '@/components/SortBy.vue'
 import Filter from '@/components/Filter.vue'

From ef3babe7a18191a884a7c2f349e311398c9a3090 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:02:23 +0530
Subject: [PATCH 03/17] fix: added more fields in deal doctype

---
 crm/fcrm/doctype/crm_deal/crm_deal.json | 46 ++++++++++++++++++-------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
index 30f9e7c44..41289ef09 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.json
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -13,12 +13,15 @@
   "column_break_afce",
   "deal_owner",
   "close_date",
-  "deal_status",
+  "status",
   "probability",
   "next_step",
   "section_break_eepu",
   "lead",
-  "column_break_bqvs"
+  "column_break_bqvs",
+  "contacts_tab",
+  "email",
+  "mobile_no"
  ],
  "fields": [
   {
@@ -79,29 +82,47 @@
    "label": "Deal Owner",
    "options": "User"
   },
+  {
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Naming Series",
+   "options": "CRM-DEAL-.YYYY.-"
+  },
+  {
+   "fieldname": "contacts_tab",
+   "fieldtype": "Tab Break",
+   "label": "Contacts"
+  },
+  {
+   "fieldname": "email",
+   "fieldtype": "Data",
+   "label": "Email",
+   "options": "Email"
+  },
+  {
+   "fieldname": "mobile_no",
+   "fieldtype": "Data",
+   "label": "Mobile No",
+   "options": "Phone"
+  },
   {
    "default": "Qualification",
-   "fieldname": "deal_status",
+   "fieldname": "status",
    "fieldtype": "Select",
    "in_list_view": 1,
-   "label": "Deal Status",
+   "label": "Status",
    "options": "Qualification\nDemo/Making\nProposal/Quotation\nNegotiation\nReady to Close\nWon\nLost",
    "reqd": 1,
    "search_index": 1
-  },
-  {
-   "fieldname": "naming_series",
-   "fieldtype": "Select",
-   "label": "Naming Series",
-   "options": "CRM-DEAL-.YYYY.-"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-06 18:07:22.815164",
+ "modified": "2023-11-06 21:53:50.442404",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",
+ "naming_rule": "By \"Naming Series\" field",
  "owner": "Administrator",
  "permissions": [
   {
@@ -119,5 +140,6 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC",
- "states": []
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file

From c6118569ee99fe55243a14a51332a3379dfdcdf3 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:03:04 +0530
Subject: [PATCH 04/17] fix: organization options in newLead dialog not working

---
 frontend/src/components/NewLead.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/NewLead.vue b/frontend/src/components/NewLead.vue
index aa48d65f5..0c7b1f06f 100644
--- a/frontend/src/components/NewLead.vue
+++ b/frontend/src/components/NewLead.vue
@@ -148,7 +148,7 @@ const allFields = [
         placeholder: 'Organization',
         options: getOrganizationOptions(),
         change: (option) => {
-          newLead.organization = option.name
+          props.newLead.organization = option.value
         },
       },
       {

From 70c46ab30f581b6532c319ae76a103681f7867bd Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:08:47 +0530
Subject: [PATCH 05/17] fix: changed deal_status to status in utils

---
 frontend/src/utils/index.js | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 4df54805d..6467cd014 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -71,23 +71,15 @@ export const dealStatuses = {
 }
 
 export function statusDropdownOptions(data, doctype, action) {
-  let statuses = leadStatuses
-  if (doctype == 'deal') {
-    statuses = dealStatuses
-  }
+  let statuses = doctype == 'deal' ? dealStatuses : leadStatuses
   let options = []
   for (const status in statuses) {
     options.push({
       label: statuses[status].label,
       icon: () => h(IndicatorIcon, { class: statuses[status].color }),
       onClick: () => {
-        if (doctype == 'deal') {
-          data.deal_status = statuses[status].label
-        } else {
-          data.status = statuses[status].label
-        }
-        let field = doctype == 'deal' ? 'deal_status' : 'status'
-        action && action(field, statuses[status].label)
+        data.status = statuses[status].label
+        action && action('status', statuses[status].label)
       },
     })
   }

From b67fc41d3fdfe03888f9ae25495e886815033d81 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:10:41 +0530
Subject: [PATCH 06/17] fix: render lead/deal in contact & organization
 correctly

---
 frontend/src/pages/Contact.vue      | 14 +++++++-------
 frontend/src/pages/Organization.vue | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index 245458a40..138ea6f32 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -306,7 +306,7 @@ const leads = createListResource({
   ],
   filters: {
     email: contact.value.email_id,
-    is_deal: 0,
+    converted: 0,
   },
   orderBy: 'modified desc',
   pageLength: 20,
@@ -321,7 +321,7 @@ const deals = createListResource({
     'name',
     'organization',
     'annual_revenue',
-    'deal_status',
+    'status',
     'email',
     'mobile_no',
     'lead_owner',
@@ -329,7 +329,7 @@ const deals = createListResource({
   ],
   filters: {
     email: contact.value.email_id,
-    is_deal: 1,
+    converted: 1,
   },
   orderBy: 'modified desc',
   pageLength: 20,
@@ -388,9 +388,9 @@ function getDealRowObject(deal) {
       logo: getOrganization(deal.organization)?.organization_logo,
     },
     annual_revenue: formatNumberIntoCurrency(deal.annual_revenue),
-    deal_status: {
-      label: deal.deal_status,
-      color: dealStatuses[deal.deal_status]?.color,
+    status: {
+      label: deal.status,
+      color: dealStatuses[deal.status]?.color,
     },
     email: deal.email,
     mobile_no: deal.mobile_no,
@@ -456,7 +456,7 @@ const dealColumns = [
   },
   {
     label: 'Status',
-    key: 'deal_status',
+    key: 'status',
     width: '10rem',
   },
   {
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index 3e5a42e0e..ba56c70a6 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -298,7 +298,7 @@ const leads = createListResource({
   ],
   filters: {
     organization: props.organization.name,
-    is_deal: 0,
+    converted: 0,
   },
   orderBy: 'modified desc',
   pageLength: 20,
@@ -313,7 +313,7 @@ const deals = createListResource({
     'name',
     'organization',
     'annual_revenue',
-    'deal_status',
+    'status',
     'email',
     'mobile_no',
     'lead_owner',
@@ -321,7 +321,7 @@ const deals = createListResource({
   ],
   filters: {
     organization: props.organization.name,
-    is_deal: 1,
+    converted: 1,
   },
   orderBy: 'modified desc',
   pageLength: 20,
@@ -409,9 +409,9 @@ function getDealRowObject(deal) {
       logo: props.organization?.organization_logo,
     },
     annual_revenue: formatNumberIntoCurrency(deal.annual_revenue),
-    deal_status: {
-      label: deal.deal_status,
-      color: dealStatuses[deal.deal_status]?.color,
+    status: {
+      label: deal.status,
+      color: dealStatuses[deal.status]?.color,
     },
     email: deal.email,
     mobile_no: deal.mobile_no,
@@ -498,7 +498,7 @@ const dealColumns = [
   },
   {
     label: 'Status',
-    key: 'deal_status',
+    key: 'status',
     width: '10rem',
   },
   {

From 199e15779bb515d1b690c0e3eb605a7b9571ce05 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:11:16 +0530
Subject: [PATCH 07/17] fix: changed field names in deal list view component

---
 frontend/src/components/ListViews/DealsListView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/ListViews/DealsListView.vue b/frontend/src/components/ListViews/DealsListView.vue
index 542e7417c..8824466b6 100644
--- a/frontend/src/components/ListViews/DealsListView.vue
+++ b/frontend/src/components/ListViews/DealsListView.vue
@@ -18,7 +18,7 @@
       >
         <ListRowItem :item="item">
           <template #prefix>
-            <div v-if="column.key === 'deal_status'">
+            <div v-if="column.key === 'status'">
               <IndicatorIcon :class="item.color" />
             </div>
             <div v-else-if="column.key === 'organization'">
@@ -30,7 +30,7 @@
                 size="sm"
               />
             </div>
-            <div v-else-if="column.key === 'lead_owner'">
+            <div v-else-if="column.key === 'deal_owner'">
               <Avatar
                 v-if="item.full_name"
                 class="flex items-center"

From 3e7dcbc800d89979b247594bc8279f403c70422a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:12:56 +0530
Subject: [PATCH 08/17] fix: updated lead/deal page code

---
 frontend/src/pages/Deal.vue | 44 ++++++++++++++++++++++---------------
 frontend/src/pages/Lead.vue | 23 ++++++++++++++-----
 2 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index e48efa3c1..5a003508b 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -7,12 +7,12 @@
       <FormControl
         type="autocomplete"
         :options="activeAgents"
-        :value="getUser(deal.data.lead_owner).full_name"
+        :value="getUser(deal.data.deal_owner).full_name"
         @change="(option) => updateAssignedAgent(option.email)"
         placeholder="Deal owner"
       >
         <template #prefix>
-          <UserAvatar class="mr-2" :user="deal.data.lead_owner" size="sm" />
+          <UserAvatar class="mr-2" :user="deal.data.deal_owner" size="sm" />
         </template>
         <template #item-prefix="{ option }">
           <UserAvatar class="mr-2" :user="option.email" size="sm" />
@@ -20,17 +20,16 @@
       </FormControl>
       <Dropdown :options="statusDropdownOptions(deal.data, 'deal', updateDeal)">
         <template #default="{ open }">
-          <Button :label="deal.data.deal_status">
+          <Button :label="deal.data.status">
             <template #prefix>
-              <IndicatorIcon
-                :class="dealStatuses[deal.data.deal_status].color"
-              />
+              <IndicatorIcon :class="dealStatuses[deal.data.status].color" />
             </template>
-            <template #suffix
-              ><FeatherIcon
+            <template #suffix>
+              <FeatherIcon
                 :name="open ? 'chevron-up' : 'chevron-down'"
                 class="h-4 text-gray-600"
-            /></template>
+              />
+            </template>
           </Button>
         </template>
       </Dropdown>
@@ -254,7 +253,8 @@
                         :debounce="500"
                         class="form-control"
                       />
-                      <Tooltip :text="field.tooltip"
+                      <Tooltip
+                        :text="field.tooltip"
                         class="flex h-7 cursor-pointer items-center px-2 py-1"
                         v-else-if="field.type === 'read_only'"
                       >
@@ -272,7 +272,11 @@
                       />
                     </div>
                     <ExternalLinkIcon
-                      v-if="field.type === 'link' && field.link && deal.data[field.name]"
+                      v-if="
+                        field.type === 'link' &&
+                        field.link &&
+                        deal.data[field.name]
+                      "
                       class="h-4 w-4 shrink-0 cursor-pointer text-gray-600"
                       @click="field.link(deal.data[field.name])"
                     />
@@ -335,7 +339,7 @@ const props = defineProps({
 })
 
 const deal = createResource({
-  url: 'crm.fcrm.doctype.crm_lead.api.get_lead',
+  url: 'crm.fcrm.doctype.crm_deal.api.get_deal',
   params: { name: props.dealId },
   cache: ['deal', props.dealId],
   auto: true,
@@ -347,7 +351,7 @@ function updateDeal(fieldname, value) {
   createResource({
     url: 'frappe.client.set_value',
     params: {
-      doctype: 'CRM Lead',
+      doctype: 'CRM Deal',
       name: props.dealId,
       fieldname,
       value,
@@ -377,7 +381,7 @@ function updateDeal(fieldname, value) {
 const breadcrumbs = computed(() => {
   let items = [{ label: 'Deals', route: { name: 'Deals' } }]
   items.push({
-    label: organization.value.name,
+    label: organization.value?.name,
     route: { name: 'Deal', params: { dealId: deal.data.name } },
   })
   return items
@@ -435,12 +439,16 @@ const detailSections = computed(() => {
           type: 'read_only',
           name: 'website',
           value: organization.value?.website,
-          tooltip: 'It is a read only field, value is fetched from organization',
+          tooltip:
+            'It is a read only field, value is fetched from organization',
         },
         {
           label: 'Amount',
-          type: 'number',
+          type: 'read_only',
           name: 'annual_revenue',
+          value: organization.value?.annual_revenue,
+          tooltip:
+            'It is a read only field, value is fetched from organization',
         },
         {
           label: 'Close date',
@@ -514,8 +522,8 @@ const organization = computed(() => {
 })
 
 function updateAssignedAgent(email) {
-  deal.data.lead_owner = email
-  updateDeal('lead_owner', email)
+  deal.data.deal_owner = email
+  updateDeal('deal_owner', email)
 }
 </script>
 
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 144e4d310..082db2415 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -336,6 +336,7 @@ import {
   Avatar,
   Tabs,
   Breadcrumbs,
+  call,
 } from 'frappe-ui'
 import { ref, computed } from 'vue'
 import { useRouter } from 'vue-router'
@@ -372,9 +373,6 @@ function updateLead(fieldname, value) {
     },
     auto: true,
     onSuccess: () => {
-      if (fieldname == 'is_deal') {
-        router.push({ name: 'Deal', params: { dealId: lead.data.name } })
-      }
       lead.reload()
       contacts.reload()
       reload.value = true
@@ -565,8 +563,23 @@ const organization = computed(() => {
 
 function convertToDeal() {
   lead.data.status = 'Qualified'
-  lead.data.is_deal = 1
-  updateLead('is_deal', 1)
+  lead.data.converted = 1
+  createDeal(lead.data)
+}
+
+async function createDeal(lead) {
+  let d = await call('frappe.client.insert', {
+    doc: {
+      doctype: 'CRM Deal',
+      organization: lead.organization,
+      email: lead.email,
+      mobile_no: lead.mobile_no,
+      lead: lead.name,
+    },
+  })
+  if (d.name) {
+    router.push({ name: 'Deal', params: { dealId: d.name } })
+  }
 }
 
 function updateAssignedAgent(email) {

From 71a0b6780810ca33457cd491905d92094055d7d2 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:14:35 +0530
Subject: [PATCH 09/17] fix: updated leads/deals list view code

---
 frontend/src/pages/Deals.vue | 79 ++++++++++++++++--------------------
 frontend/src/pages/Leads.vue |  2 +-
 2 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue
index 9783fddc2..3edbc493c 100644
--- a/frontend/src/pages/Deals.vue
+++ b/frontend/src/pages/Deals.vue
@@ -28,8 +28,8 @@
       </Dropdown>
     </div>
     <div class="flex items-center gap-2">
-      <Filter doctype="CRM Lead" />
-      <SortBy doctype="CRM Lead" />
+      <Filter doctype="CRM Deal" />
+      <SortBy doctype="CRM Deal" />
       <Button icon="more-horizontal" />
     </div>
   </div>
@@ -96,23 +96,20 @@ const currentView = ref({
 })
 
 function getFilter() {
-  return {
-    ...(getArgs() || {}),
-    is_deal: 1,
-  }
+  return getArgs() || {}
 }
 
-const leads = createListResource({
+const deals = createListResource({
   type: 'list',
-  doctype: 'CRM Lead',
+  doctype: 'CRM Deal',
   fields: [
     'name',
     'organization',
     'annual_revenue',
-    'deal_status',
+    'status',
     'email',
     'mobile_no',
-    'lead_owner',
+    'deal_owner',
     'modified',
   ],
   filters: getFilter(),
@@ -125,8 +122,8 @@ watch(
   () => getOrderBy(),
   (value, old_value) => {
     if (!value && !old_value) return
-    leads.orderBy = getOrderBy() || 'modified desc'
-    leads.reload()
+    deals.orderBy = getOrderBy() || 'modified desc'
+    deals.reload()
   },
   { immediate: true }
 )
@@ -135,8 +132,8 @@ watch(
   storage,
   useDebounceFn((value, old_value) => {
     if (JSON.stringify([...value]) === JSON.stringify([...old_value])) return
-    leads.filters = getFilter()
-    leads.reload()
+    deals.filters = getFilter()
+    deals.reload()
   }, 300),
   { deep: true }
 )
@@ -154,7 +151,7 @@ const columns = [
   },
   {
     label: 'Status',
-    key: 'deal_status',
+    key: 'status',
     width: '10rem',
   },
   {
@@ -168,8 +165,8 @@ const columns = [
     width: '11rem',
   },
   {
-    label: 'Lead owner',
-    key: 'lead_owner',
+    label: 'Deal owner',
+    key: 'deal_owner',
     width: '10rem',
   },
   {
@@ -180,28 +177,28 @@ const columns = [
 ]
 
 const rows = computed(() => {
-  if (!leads.data) return []
-  return leads.data.map((lead) => {
+  if (!deals.data) return []
+  return deals.data.map((deal) => {
     return {
-      name: lead.name,
+      name: deal.name,
       organization: {
-        label: lead.organization,
-        logo: getOrganization(lead.organization)?.organization_logo,
+        label: deal.organization,
+        logo: getOrganization(deal.organization)?.organization_logo,
       },
-      annual_revenue: formatNumberIntoCurrency(lead.annual_revenue),
-      deal_status: {
-        label: lead.deal_status,
-        color: dealStatuses[lead.deal_status]?.color,
+      annual_revenue: formatNumberIntoCurrency(deal.annual_revenue),
+      status: {
+        label: deal.status,
+        color: dealStatuses[deal.status]?.color,
       },
-      email: lead.email,
-      mobile_no: lead.mobile_no,
-      lead_owner: {
-        label: lead.lead_owner && getUser(lead.lead_owner).full_name,
-        ...(lead.lead_owner && getUser(lead.lead_owner)),
+      email: deal.email,
+      mobile_no: deal.mobile_no,
+      deal_owner: {
+        label: deal.deal_owner && getUser(deal.deal_owner).full_name,
+        ...(deal.deal_owner && getUser(deal.deal_owner)),
       },
       modified: {
-        label: dateFormat(lead.modified, dateTooltipFormat),
-        timeAgo: timeAgo(lead.modified),
+        label: dateFormat(deal.modified, dateTooltipFormat),
+        timeAgo: timeAgo(deal.modified),
       },
     }
   })
@@ -253,25 +250,19 @@ const viewsDropdownOptions = [
 const showNewDialog = ref(false)
 
 let newDeal = reactive({
-  salutation: '',
-  first_name: '',
-  last_name: '',
-  lead_name: '',
   organization: '',
-  deal_status: 'Qualification',
+  status: 'Qualification',
   email: '',
   mobile_no: '',
-  lead_owner: getUser().email,
-  is_deal: 1,
-  created_as_deal: 1,
+  deal_owner: getUser().email,
 })
 
-const createLead = createResource({
+const createDeal = createResource({
   url: 'frappe.client.insert',
   makeParams(values) {
     return {
       doc: {
-        doctype: 'CRM Lead',
+        doctype: 'CRM Deal',
         ...values,
       },
     }
@@ -281,7 +272,7 @@ const createLead = createResource({
 const router = useRouter()
 
 function createNewDeal(close) {
-  createLead
+  createDeal
     .submit(newDeal, {
       validate() {
         if (!newDeal.first_name) {
diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue
index b0e26a1df..de1f1c28e 100644
--- a/frontend/src/pages/Leads.vue
+++ b/frontend/src/pages/Leads.vue
@@ -91,7 +91,7 @@ const currentView = ref({
 function getFilter() {
   return {
     ...(getArgs() || {}),
-    is_deal: 0,
+    converted: 0,
   }
 }
 

From 256a4bba254fceec269e6844f6dcb5a26f1fc5c9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:15:32 +0530
Subject: [PATCH 10/17] fix: remove unused fields in lead doctype

---
 crm/fcrm/doctype/crm_lead/crm_lead.json | 74 +++++++------------------
 1 file changed, 19 insertions(+), 55 deletions(-)

diff --git a/crm/fcrm/doctype/crm_lead/crm_lead.json b/crm/fcrm/doctype/crm_lead/crm_lead.json
index bfe7dbbd4..8257a2e5f 100644
--- a/crm/fcrm/doctype/crm_lead/crm_lead.json
+++ b/crm/fcrm/doctype/crm_lead/crm_lead.json
@@ -13,20 +13,15 @@
   "first_name",
   "middle_name",
   "last_name",
-  "is_deal",
-  "created_as_deal",
   "column_break_izjs",
   "lead_name",
   "gender",
-  "lead_owner",
-  "status",
   "image",
   "column_break_lcuv",
+  "lead_owner",
+  "status",
   "source",
-  "deal_status",
-  "close_date",
-  "probability",
-  "next_step",
+  "converted",
   "organization_tab",
   "section_break_uixv",
   "organization",
@@ -93,7 +88,7 @@
    "fieldname": "status",
    "fieldtype": "Select",
    "in_list_view": 1,
-   "label": "Lead Status",
+   "label": "Status",
    "options": "Open\nContacted\nNurture\nQualified\nUnqualified\nJunk",
    "reqd": 1,
    "search_index": 1
@@ -123,8 +118,9 @@
   },
   {
    "fieldname": "mobile_no",
-   "fieldtype": "Phone",
-   "label": "Mobile No"
+   "fieldtype": "Data",
+   "label": "Mobile No",
+   "options": "Phone"
   },
   {
    "fieldname": "column_break_sjtw",
@@ -132,8 +128,9 @@
   },
   {
    "fieldname": "phone",
-   "fieldtype": "Phone",
-   "label": "Phone"
+   "fieldtype": "Data",
+   "label": "Phone",
+   "options": "Phone"
   },
   {
    "fieldname": "section_break_uixv",
@@ -189,25 +186,6 @@
    "label": "Full Name",
    "search_index": 1
   },
-  {
-   "default": "Qualification",
-   "fieldname": "deal_status",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Deal Status",
-   "options": "Qualification\nDemo/Making\nProposal/Quotation\nNegotiation\nReady to Close\nWon\nLost",
-   "reqd": 1,
-   "search_index": 1
-  },
-  {
-   "default": "0",
-   "fieldname": "is_deal",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
-   "label": "Is Deal",
-   "search_index": 1
-  },
   {
    "fetch_from": "organization.job_title",
    "fieldname": "job_title",
@@ -225,21 +203,6 @@
    "fieldtype": "Tab Break",
    "label": "Contact"
   },
-  {
-   "fieldname": "close_date",
-   "fieldtype": "Date",
-   "label": "Close Date"
-  },
-  {
-   "fieldname": "probability",
-   "fieldtype": "Data",
-   "label": "Probability"
-  },
-  {
-   "fieldname": "next_step",
-   "fieldtype": "Data",
-   "label": "Next Step"
-  },
   {
    "fieldname": "contacts",
    "fieldtype": "Table",
@@ -250,24 +213,25 @@
    "fieldname": "section_break_jyxr",
    "fieldtype": "Section Break"
   },
-  {
-   "default": "0",
-   "fieldname": "created_as_deal",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Created as Deal"
-  },
   {
    "fieldname": "organization",
    "fieldtype": "Link",
    "label": "Organization",
    "options": "CRM Organization"
+  },
+  {
+   "default": "0",
+   "fieldname": "converted",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Converted"
   }
  ],
  "image_field": "image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-06 15:29:56.868755",
+ "modified": "2023-11-06 21:53:32.542503",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Lead",

From 98f76e14178e74265ce2cb5a877b94408bd75c20 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:15:51 +0530
Subject: [PATCH 11/17] fix: new deal dialog

---
 frontend/src/components/NewDeal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/NewDeal.vue b/frontend/src/components/NewDeal.vue
index a4b3dbdb3..869ad0eab 100644
--- a/frontend/src/components/NewDeal.vue
+++ b/frontend/src/components/NewDeal.vue
@@ -10,7 +10,7 @@
             :options="field.options"
             v-model="newDeal[field.name]"
           >
-            <template v-if="field.name == 'deal_status'" #prefix>
+            <template v-if="field.name == 'status'" #prefix>
               <IndicatorIcon :class="dealStatuses[newDeal[field.name]].color" />
             </template>
           </FormControl>
@@ -153,7 +153,7 @@ const allFields = [
       },
       {
         label: 'Status',
-        name: 'deal_status',
+        name: 'status',
         type: 'select',
         options: statusDropdownOptions(props.newDeal, 'deal'),
       },

From de4aa2ae865200fa59043cd4d151390df53b271e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:18:02 +0530
Subject: [PATCH 12/17] fix: moved all get activites logic in separate file

---
 crm/api/activities.py            | 220 +++++++++++++++++++++++++++++++
 crm/fcrm/doctype/crm_deal/api.py |  25 ++++
 crm/fcrm/doctype/crm_lead/api.py | 123 -----------------
 3 files changed, 245 insertions(+), 123 deletions(-)
 create mode 100644 crm/api/activities.py
 create mode 100644 crm/fcrm/doctype/crm_deal/api.py

diff --git a/crm/api/activities.py b/crm/api/activities.py
new file mode 100644
index 000000000..c761a2119
--- /dev/null
+++ b/crm/api/activities.py
@@ -0,0 +1,220 @@
+import json
+
+import frappe
+from frappe import _
+from frappe.desk.form.load import get_docinfo
+
+@frappe.whitelist()
+def get_activities(name):
+	if frappe.db.exists("CRM Deal", name):
+		return get_deal_activities(name)
+	elif frappe.db.exists("CRM Lead", name):
+		return get_lead_activities(name)
+	else:
+		frappe.throw(_("Document not found"), frappe.DoesNotExistError)
+
+def get_deal_activities(name):
+	get_docinfo('', "CRM Deal", name)
+	docinfo = frappe.response["docinfo"]
+	deal_fields_meta = frappe.get_meta("CRM Deal").fields
+
+	doc = frappe.db.get_values("CRM Deal", name, ["creation", "owner", "lead"])[0]
+	lead = doc[2]
+
+	activities = []
+	creation_text = "created this deal"
+
+	if lead:
+		activities = get_lead_activities(lead)
+		creation_text = "converted the lead to this deal"
+
+	activities.append({
+		"activity_type": "creation",
+		"creation": doc[0],
+		"owner": doc[1],
+		"data": creation_text,
+		"is_lead": False,
+	})
+
+	docinfo.versions.reverse()
+
+	for version in docinfo.versions:
+		data = json.loads(version.data)
+		if not data.get("changed"):
+			continue
+
+		field_option = None
+
+		if change := data.get("changed")[0]:
+			field_label, field_option = next(((f.label, f.options) for f in deal_fields_meta if f.fieldname == change[0]), None)
+			activity_type = "changed"
+			data = {
+				"field": change[0],
+				"field_label": field_label,
+				"old_value": change[1],
+				"value": change[2],
+			}
+			if not change[1] and not change[2]:
+				continue
+			if not change[1] and change[2]:
+				activity_type = "added"
+				data = {
+					"field": change[0],
+					"field_label": field_label,
+					"value": change[2],
+				}
+			elif change[1] and not change[2]:
+				activity_type = "removed"
+				data = {
+					"field": change[0],
+					"field_label": field_label,
+					"value": change[1],
+				}
+
+		activity = {
+			"activity_type": activity_type,
+			"creation": version.creation,
+			"owner": version.owner,
+			"data": data,
+			"is_lead": False,
+			"options": field_option,
+		}
+		activities.append(activity)
+
+	for communication in docinfo.communications:
+		activity = {
+			"activity_type": "communication",
+			"creation": communication.creation,
+			"data": {
+				"subject": communication.subject,
+				"content": communication.content,
+				"sender_full_name": communication.sender_full_name,
+				"sender": communication.sender,
+				"recipients": communication.recipients,
+				"cc": communication.cc,
+				"bcc": communication.bcc,
+				"read_by_recipient": communication.read_by_recipient,
+			},
+			"is_lead": False,
+		}
+		activities.append(activity)
+
+	activities.sort(key=lambda x: x["creation"], reverse=True)
+	activities = handle_multiple_versions(activities)
+
+	return activities
+
+def get_lead_activities(name):
+	get_docinfo('', "CRM Lead", name)
+	docinfo = frappe.response["docinfo"]
+	lead_fields_meta = frappe.get_meta("CRM Lead").fields
+
+	doc = frappe.db.get_values("CRM Lead", name, ["creation", "owner"])[0]
+	activities = [{
+		"activity_type": "creation",
+		"creation": doc[0],
+		"owner": doc[1],
+		"data": "created this lead",
+		"is_lead": True,
+	}]
+
+	docinfo.versions.reverse()
+
+	for version in docinfo.versions:
+		data = json.loads(version.data)
+		if not data.get("changed"):
+			continue
+
+		field_option = None
+
+		if change := data.get("changed")[0]:
+			field_label, field_option = next(((f.label, f.options) for f in lead_fields_meta if f.fieldname == change[0]), None)
+			activity_type = "changed"
+			data = {
+				"field": change[0],
+				"field_label": field_label,
+				"old_value": change[1],
+				"value": change[2],
+			}
+			if not change[1] and not change[2]:
+				continue
+			if not change[1] and change[2]:
+				activity_type = "added"
+				data = {
+					"field": change[0],
+					"field_label": field_label,
+					"value": change[2],
+				}
+			elif change[1] and not change[2]:
+				activity_type = "removed"
+				data = {
+					"field": change[0],
+					"field_label": field_label,
+					"value": change[1],
+				}
+
+		activity = {
+			"activity_type": activity_type,
+			"creation": version.creation,
+			"owner": version.owner,
+			"data": data,
+			"is_lead": True,
+			"options": field_option,
+		}
+		activities.append(activity)
+
+	for communication in docinfo.communications:
+		activity = {
+			"activity_type": "communication",
+			"creation": communication.creation,
+			"data": {
+				"subject": communication.subject,
+				"content": communication.content,
+				"sender_full_name": communication.sender_full_name,
+				"sender": communication.sender,
+				"recipients": communication.recipients,
+				"cc": communication.cc,
+				"bcc": communication.bcc,
+				"read_by_recipient": communication.read_by_recipient,
+			},
+			"is_lead": True,
+		}
+		activities.append(activity)
+
+	activities.sort(key=lambda x: x["creation"], reverse=True)
+	activities = handle_multiple_versions(activities)
+
+	return activities
+
+def handle_multiple_versions(versions):
+	activities = []
+	grouped_versions = []
+	old_version = None
+	for version in versions:
+		is_version = version["activity_type"] in ["changed", "added", "removed"]
+		if not is_version:
+			activities.append(version)
+		if not old_version:
+			old_version = version
+			if is_version: grouped_versions.append(version)
+			continue
+		if is_version and old_version.get("owner") and version["owner"] == old_version["owner"]:
+			grouped_versions.append(version)
+		else:
+			if grouped_versions:
+				activities.append(parse_grouped_versions(grouped_versions))
+			grouped_versions = []
+			if is_version: grouped_versions.append(version)
+		old_version = version
+		if version == versions[-1] and grouped_versions:
+			activities.append(parse_grouped_versions(grouped_versions))
+
+	return activities
+
+def parse_grouped_versions(versions):
+	version = versions[0]
+	if len(versions) == 1:
+		return version
+	other_versions = versions[1:]
+	version["other_versions"] = other_versions
+	return version
\ No newline at end of file
diff --git a/crm/fcrm/doctype/crm_deal/api.py b/crm/fcrm/doctype/crm_deal/api.py
new file mode 100644
index 000000000..0dc14355c
--- /dev/null
+++ b/crm/fcrm/doctype/crm_deal/api.py
@@ -0,0 +1,25 @@
+import json
+
+import frappe
+from frappe import _
+from frappe.desk.form.load import get_docinfo
+from crm.fcrm.doctype.crm_lead.api import get_activities as get_lead_activities
+
+
+@frappe.whitelist()
+def get_deal(name):
+	Deal = frappe.qb.DocType("CRM Deal")
+
+	query = (
+		frappe.qb.from_(Deal)
+		.select("*")
+		.where(Deal.name == name)
+		.limit(1)
+	)
+
+	deal = query.run(as_dict=True)
+	if not len(deal):
+		frappe.throw(_("Deal not found"), frappe.DoesNotExistError)
+	deal = deal.pop()
+
+	return deal
diff --git a/crm/fcrm/doctype/crm_lead/api.py b/crm/fcrm/doctype/crm_lead/api.py
index 5f22efb42..4abd959a3 100644
--- a/crm/fcrm/doctype/crm_lead/api.py
+++ b/crm/fcrm/doctype/crm_lead/api.py
@@ -22,126 +22,3 @@ def get_lead(name):
 	lead = lead.pop()
 
 	return lead
-
-@frappe.whitelist()
-def get_activities(name):
-	get_docinfo('', "CRM Lead", name)
-	docinfo = frappe.response["docinfo"]
-	lead_fields_meta = frappe.get_meta("CRM Lead").fields
-
-	doc = frappe.db.get_values("CRM Lead", name, ["creation", "owner", "created_as_deal"])[0]
-	created_as_deal = doc[2]
-	is_lead = False if created_as_deal else True
-	activities = [{
-		"activity_type": "creation",
-		"creation": doc[0],
-		"owner": doc[1],
-		"data": "created this " + ("deal" if created_as_deal else "lead"),
-		"is_lead": is_lead,
-	}]
-
-	docinfo.versions.reverse()
-
-	for version in docinfo.versions:
-		data = json.loads(version.data)
-		if not data.get("changed"):
-			continue
-
-		field_option = None
-
-		if change := data.get("changed")[0]:
-			field_label, field_option = next(((f.label, f.options) for f in lead_fields_meta if f.fieldname == change[0]), None)
-			activity_type = "changed"
-			if field_label == "Lead Owner" and (created_as_deal or not is_lead):
-				field_label = "Deal Owner"
-			data = {
-				"field": change[0],
-				"field_label": field_label,
-				"old_value": change[1],
-				"value": change[2],
-			}
-			if not change[1] and not change[2]:
-				continue
-			if not change[1] and change[2]:
-				activity_type = "added"
-				data = {
-					"field": change[0],
-					"field_label": field_label,
-					"value": change[2],
-				}
-				if field_label == "Is Deal" and change[2] and is_lead:
-					activity_type = "deal"
-					is_lead = False
-			elif change[1] and not change[2]:
-				activity_type = "removed"
-				data = {
-					"field": change[0],
-					"field_label": field_label,
-					"value": change[1],
-				}
-
-		activity = {
-			"activity_type": activity_type,
-			"creation": version.creation,
-			"owner": version.owner,
-			"data": data,
-			"is_lead": is_lead,
-			"options": field_option,
-		}
-		activities.append(activity)
-
-	for communication in docinfo.communications:
-		activity = {
-			"activity_type": "communication",
-			"creation": communication.creation,
-			"data": {
-				"subject": communication.subject,
-				"content": communication.content,
-				"sender_full_name": communication.sender_full_name,
-				"sender": communication.sender,
-				"recipients": communication.recipients,
-				"cc": communication.cc,
-				"bcc": communication.bcc,
-				"read_by_recipient": communication.read_by_recipient,
-			},
-			"is_lead": is_lead,
-		}
-		activities.append(activity)
-
-	activities.sort(key=lambda x: x["creation"], reverse=True)
-	activities = handle_multiple_versions(activities)
-
-	return activities
-
-def handle_multiple_versions(versions):
-	activities = []
-	grouped_versions = []
-	old_version = None
-	for version in versions:
-		is_version = version["activity_type"] in ["changed", "added", "removed"]
-		if not is_version:
-			activities.append(version)
-		if not old_version:
-			old_version = version
-			if is_version: grouped_versions.append(version)
-			continue
-		if is_version and old_version.get("owner") and version["owner"] == old_version["owner"]:
-			grouped_versions.append(version)
-		else:
-			if grouped_versions:
-				activities.append(parse_grouped_versions(grouped_versions))
-			grouped_versions = []
-			if is_version: grouped_versions.append(version)
-		old_version = version
-		if version == versions[-1] and grouped_versions:
-			activities.append(parse_grouped_versions(grouped_versions))
-
-	return activities
-
-def parse_grouped_versions(versions):
-	version = versions[0]
-	if len(versions) == 1:
-		return version
-	other_versions = versions[1:]
-	version["other_versions"] = other_versions
-	return version
\ No newline at end of file

From a685724d3df1a18f131c406da583f6f99dfb66bb Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 6 Nov 2023 22:19:49 +0530
Subject: [PATCH 13/17] fix: updated activities & communicationArea component
 to handle lead/deal activities

---
 frontend/src/components/Activities.vue        | 34 ++++++++-----------
 frontend/src/components/CommunicationArea.vue | 15 +++++---
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue
index ab059e89c..267331579 100644
--- a/frontend/src/components/Activities.vue
+++ b/frontend/src/components/Activities.vue
@@ -6,7 +6,7 @@
     <Button
       v-if="title == 'Calls'"
       variant="solid"
-      @click="makeCall(lead.data.mobile_no)"
+      @click="makeCall(doc.data.mobile_no)"
     >
       <template #prefix>
         <PhoneIcon class="h-4 w-4" />
@@ -561,7 +561,7 @@
       v-if="title == 'Calls'"
       variant="solid"
       label="Make a call"
-      @click="makeCall(lead.data.mobile_no)"
+      @click="makeCall(doc.data.mobile_no)"
     />
     <Button
       v-else-if="title == 'Notes'"
@@ -585,20 +585,20 @@
   <CommunicationArea
     ref="emailBox"
     v-if="['Emails', 'Activity'].includes(title)"
-    v-model="lead"
+    v-model="doc"
     v-model:reload="reload_email"
   />
   <NoteModal
     v-model="showNoteModal"
     v-model:reloadNotes="notes"
     :note="note"
-    :lead="lead.data?.name"
+    :lead="doc.data?.name"
   />
   <TaskModal
     v-model="showTaskModal"
     v-model:reloadTasks="tasks"
     :task="task"
-    :lead="lead.data?.name"
+    :lead="doc.data?.name"
   />
 </template>
 <script setup>
@@ -654,22 +654,22 @@ const props = defineProps({
   },
 })
 
-const lead = defineModel()
+const doc = defineModel()
 const reload = defineModel('reload')
 
 const reload_email = ref(false)
 
 const versions = createResource({
-  url: 'crm.fcrm.doctype.crm_lead.api.get_activities',
-  params: { name: lead.value.data.name },
-  cache: ['activity', lead.value.data.name],
+  url: 'crm.api.activities.get_activities',
+  params: { name: doc.value.data.name },
+  cache: ['activity', doc.value.data.name],
   auto: true,
 })
 
 const calls = createListResource({
   type: 'list',
   doctype: 'CRM Call Log',
-  cache: ['Call Logs', lead.value.data.name],
+  cache: ['Call Logs', doc.value.data.name],
   fields: [
     'name',
     'caller',
@@ -685,7 +685,7 @@ const calls = createListResource({
     'creation',
     'note',
   ],
-  filters: { lead: lead.value.data.name },
+  filters: { lead: doc.value.data.name },
   orderBy: 'creation desc',
   pageLength: 999,
   auto: true,
@@ -722,9 +722,9 @@ const calls = createListResource({
 const notes = createListResource({
   type: 'list',
   doctype: 'CRM Note',
-  cache: ['Notes', lead.value.data.name],
+  cache: ['Notes', doc.value.data.name],
   fields: ['name', 'title', 'content', 'owner', 'modified'],
-  filters: { lead: lead.value.data.name },
+  filters: { lead: doc.value.data.name },
   orderBy: 'modified desc',
   pageLength: 999,
   auto: true,
@@ -733,7 +733,7 @@ const notes = createListResource({
 const tasks = createListResource({
   type: 'list',
   doctype: 'CRM Task',
-  cache: ['Tasks', lead.value.data.name],
+  cache: ['Tasks', doc.value.data.name],
   fields: [
     'name',
     'title',
@@ -745,7 +745,7 @@ const tasks = createListResource({
     'status',
     'modified',
   ],
-  filters: { lead: lead.value.data.name },
+  filters: { lead: doc.value.data.name },
   orderBy: 'modified desc',
   pageLength: 999,
   auto: true,
@@ -805,10 +805,6 @@ function update_activities_details(activity) {
 
   if (activity.activity_type == 'creation') {
     activity.type = activity.data
-  } else if (activity.activity_type == 'deal') {
-    activity.type = 'converted the lead to this deal'
-    activity.data.field_label = ''
-    activity.data.value = ''
   } else if (activity.activity_type == 'added') {
     activity.type = 'added'
     activity.value = 'as'
diff --git a/frontend/src/components/CommunicationArea.vue b/frontend/src/components/CommunicationArea.vue
index f7efe47e0..eeef4b2ef 100644
--- a/frontend/src/components/CommunicationArea.vue
+++ b/frontend/src/components/CommunicationArea.vue
@@ -42,7 +42,7 @@
           },
         }"
         :editable="showCommunicationBox"
-        v-model="lead.data"
+        v-model="doc.data"
         placeholder="Add a reply..."
       />
     </div>
@@ -56,7 +56,7 @@ import { usersStore } from '@/stores/users'
 import { call } from 'frappe-ui'
 import { ref, watch, computed, defineModel } from 'vue'
 
-const lead = defineModel()
+const doc = defineModel()
 const reload = defineModel('reload')
 
 const { getUser } = usersStore()
@@ -84,14 +84,19 @@ const onNewEmailChange = (value) => {
 }
 
 async function sendMail() {
+  let doctype = 'CRM Lead'
+  if (doc.value.data.lead) {
+    doctype = 'CRM Deal'
+  }
+
   await call('frappe.core.doctype.communication.email.make', {
-    recipients: lead.value.data.email,
+    recipients: doc.value.data.email,
     cc: '',
     bcc: '',
     subject: 'Email from Agent',
     content: newEmail.value,
-    doctype: 'CRM Lead',
-    name: lead.value.data.name,
+    doctype: doctype,
+    name: doc.value.data.name,
     send_email: 1,
     sender: getUser().name,
     sender_full_name: getUser()?.full_name || undefined,

From ce4a45ccd545fc63a602edf2f075375b168edc61 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 7 Nov 2023 13:42:24 +0530
Subject: [PATCH 14/17] fix: added ref doc instead of lead in task/note to
 handle both lead and deal

---
 crm/fcrm/doctype/crm_note/crm_note.json      | 18 +++++++++++++-----
 crm/fcrm/doctype/crm_task/crm_task.json      | 18 +++++++++++++-----
 frontend/src/components/Activities.vue       | 16 +++++++++++-----
 frontend/src/components/Modals/NoteModal.vue |  9 +++++++--
 frontend/src/components/Modals/TaskModal.vue | 12 ++++++++----
 frontend/src/pages/Deal.vue                  |  7 ++++++-
 frontend/src/pages/Lead.vue                  |  7 ++++++-
 7 files changed, 64 insertions(+), 23 deletions(-)

diff --git a/crm/fcrm/doctype/crm_note/crm_note.json b/crm/fcrm/doctype/crm_note/crm_note.json
index f17f84c71..844100266 100644
--- a/crm/fcrm/doctype/crm_note/crm_note.json
+++ b/crm/fcrm/doctype/crm_note/crm_note.json
@@ -9,7 +9,8 @@
  "field_order": [
   "title",
   "content",
-  "lead"
+  "reference_doctype",
+  "reference_docname"
  ],
  "fields": [
   {
@@ -27,10 +28,17 @@
    "label": "Content"
   },
   {
-   "fieldname": "lead",
+   "default": "CRM Lead",
+   "fieldname": "reference_doctype",
    "fieldtype": "Link",
-   "label": "Lead",
-   "options": "CRM Lead"
+   "label": "Reference Document Type",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "reference_docname",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Doc",
+   "options": "reference_doctype"
   }
  ],
  "index_web_pages_for_search": 1,
@@ -40,7 +48,7 @@
    "link_fieldname": "note"
   }
  ],
- "modified": "2023-08-28 11:48:42.100802",
+ "modified": "2023-11-07 13:41:11.249515",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Note",
diff --git a/crm/fcrm/doctype/crm_task/crm_task.json b/crm/fcrm/doctype/crm_task/crm_task.json
index cf7dbe524..fa0ce47f8 100644
--- a/crm/fcrm/doctype/crm_task/crm_task.json
+++ b/crm/fcrm/doctype/crm_task/crm_task.json
@@ -10,7 +10,8 @@
   "title",
   "priority",
   "start_date",
-  "lead",
+  "reference_doctype",
+  "reference_docname",
   "column_break_cqua",
   "assigned_to",
   "status",
@@ -70,15 +71,22 @@
    "label": "Description"
   },
   {
-   "fieldname": "lead",
+   "default": "CRM Lead",
+   "fieldname": "reference_doctype",
    "fieldtype": "Link",
-   "label": "Lead",
-   "options": "CRM Lead"
+   "label": "Reference Document Type",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "reference_docname",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Doc",
+   "options": "reference_doctype"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-09-28 15:05:27.986420",
+ "modified": "2023-11-07 13:41:18.277998",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Task",
diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue
index 267331579..80b827ecf 100644
--- a/frontend/src/components/Activities.vue
+++ b/frontend/src/components/Activities.vue
@@ -592,13 +592,15 @@
     v-model="showNoteModal"
     v-model:reloadNotes="notes"
     :note="note"
-    :lead="doc.data?.name"
+    :doctype="doctype"
+    :doc="doc.data?.name"
   />
   <TaskModal
     v-model="showTaskModal"
     v-model:reloadTasks="tasks"
     :task="task"
-    :lead="doc.data?.name"
+    :doctype="doctype"
+    :doc="doc.data?.name"
   />
 </template>
 <script setup>
@@ -652,6 +654,10 @@ const props = defineProps({
     type: String,
     default: 'Activity',
   },
+  doctype: {
+    type: String,
+    default: 'CRM Lead',
+  },
 })
 
 const doc = defineModel()
@@ -724,7 +730,7 @@ const notes = createListResource({
   doctype: 'CRM Note',
   cache: ['Notes', doc.value.data.name],
   fields: ['name', 'title', 'content', 'owner', 'modified'],
-  filters: { lead: doc.value.data.name },
+  filters: { reference_docname: doc.value.data.name },
   orderBy: 'modified desc',
   pageLength: 999,
   auto: true,
@@ -745,7 +751,7 @@ const tasks = createListResource({
     'status',
     'modified',
   ],
-  filters: { lead: doc.value.data.name },
+  filters: { reference_docname: doc.value.data.name },
   orderBy: 'modified desc',
   pageLength: 999,
   auto: true,
@@ -819,7 +825,7 @@ function update_activities_details(activity) {
 }
 
 const emptyText = computed(() => {
-  let text = 'No emails communications'
+  let text = 'No email communications'
   if (props.title == 'Calls') {
     text = 'No call logs'
   } else if (props.title == 'Notes') {
diff --git a/frontend/src/components/Modals/NoteModal.vue b/frontend/src/components/Modals/NoteModal.vue
index 6c0eaf252..ac9cb1189 100644
--- a/frontend/src/components/Modals/NoteModal.vue
+++ b/frontend/src/components/Modals/NoteModal.vue
@@ -50,7 +50,11 @@ const props = defineProps({
     type: Object,
     default: {},
   },
-  lead: {
+  doctype: {
+    type: String,
+    default: 'CRM Lead',
+  },
+  doc: {
     type: String,
     default: '',
   },
@@ -85,7 +89,8 @@ async function updateNote(close) {
         doctype: 'CRM Note',
         title: _note.value.title,
         content: _note.value.content,
-        lead: props.lead || '',
+        reference_doctype: props.doctype,
+        reference_docname: props.doc || '',
       },
     })
     if (d.name) {
diff --git a/frontend/src/components/Modals/TaskModal.vue b/frontend/src/components/Modals/TaskModal.vue
index 5cf7bf8e7..5dae4d896 100644
--- a/frontend/src/components/Modals/TaskModal.vue
+++ b/frontend/src/components/Modals/TaskModal.vue
@@ -92,15 +92,18 @@ import {
   DatePicker,
   call,
 } from 'frappe-ui'
-import { ref, defineModel, h, watch, nextTick } from 'vue'
-import { get } from '@vueuse/core'
+import { ref, defineModel, watch, nextTick } from 'vue'
 
 const props = defineProps({
   task: {
     type: Object,
     default: {},
   },
-  lead: {
+  doctype: {
+    type: String,
+    default: 'CRM Lead',
+  },
+  doc: {
     type: String,
     default: '',
   },
@@ -149,7 +152,8 @@ async function updateTask(close) {
     let d = await call('frappe.client.insert', {
       doc: {
         doctype: 'CRM Task',
-        lead: props.lead || null,
+        reference_doctype: props.doctype,
+        reference_docname: props.doc || null,
         ..._task.value,
       },
     })
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 5a003508b..aa86727b9 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -37,7 +37,12 @@
   </LayoutHeader>
   <div v-if="deal.data" class="flex h-full overflow-hidden">
     <Tabs v-model="tabIndex" v-slot="{ tab }" :tabs="tabs">
-      <Activities :title="tab.label" v-model:reload="reload" v-model="deal" />
+      <Activities
+        doctype="CRM Deal"
+        :title="tab.label"
+        v-model:reload="reload"
+        v-model="deal"
+      />
     </Tabs>
     <div class="flex w-[352px] flex-col justify-between border-l">
       <div
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 082db2415..69c0a68e9 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -41,7 +41,12 @@
   </LayoutHeader>
   <div v-if="lead?.data" class="flex h-full overflow-hidden">
     <Tabs v-model="tabIndex" v-slot="{ tab }" :tabs="tabs">
-      <Activities :title="tab.label" v-model:reload="reload" v-model="lead" />
+      <Activities
+        doctype="CRM Lead"
+        :title="tab.label"
+        v-model:reload="reload"
+        v-model="lead"
+      />
     </Tabs>
     <div class="flex w-[352px] flex-col justify-between border-l">
       <div

From b6060fa1e5018e8e4720dc4bc79df58cabad3a8e Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 7 Nov 2023 13:53:13 +0530
Subject: [PATCH 15/17] fix: added ref doc instead of lead in call log

---
 .../doctype/crm_call_log/crm_call_log.json    | 24 +++++++++++------
 crm/twilio/api.py                             | 26 ++++++++++++-------
 frontend/src/components/Activities.vue        |  2 +-
 3 files changed, 34 insertions(+), 18 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 469c1127c..55b077f22 100644
--- a/crm/fcrm/doctype/crm_call_log/crm_call_log.json
+++ b/crm/fcrm/doctype/crm_call_log/crm_call_log.json
@@ -14,7 +14,8 @@
   "duration",
   "medium",
   "start_time",
-  "lead",
+  "reference_doctype",
+  "reference_docname",
   "column_break_ufnp",
   "to",
   "type",
@@ -89,12 +90,6 @@
    "fieldtype": "Datetime",
    "label": "End Time"
   },
-  {
-   "fieldname": "lead",
-   "fieldtype": "Link",
-   "label": "Lead/Deal",
-   "options": "CRM Lead"
-  },
   {
    "fieldname": "note",
    "fieldtype": "Link",
@@ -114,11 +109,24 @@
    "fieldtype": "Link",
    "label": "Caller",
    "options": "User"
+  },
+  {
+   "default": "CRM Lead",
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "label": "Reference Document Type",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "reference_docname",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Name",
+   "options": "reference_doctype"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-30 15:39:46.613734",
+ "modified": "2023-11-07 13:52:40.504747",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Call Log",
diff --git a/crm/twilio/api.py b/crm/twilio/api.py
index 4297e5a7f..93d2a5359 100644
--- a/crm/twilio/api.py
+++ b/crm/twilio/api.py
@@ -86,9 +86,10 @@ def update_call_log(call_sid, status=None):
 	call_log.duration = call_details.duration
 	call_log.start_time = get_datetime_from_timestamp(call_details.start_time)
 	call_log.end_time = get_datetime_from_timestamp(call_details.end_time)
-	call_log.lead = get_lead_from_number(call_log)
-	if call_log.note and call_log.lead:
-		frappe.db.set_value("CRM Note", call_log.note, "lead", call_log.lead)
+	call_log.reference_docname, call_log.reference_doctype = get_lead_or_deal_from_number(call_log)
+	if call_log.note and call_log.reference_docname:
+		frappe.db.set_value("CRM Note", call_log.note, "reference_doctype", call_log.reference_doctype)
+		frappe.db.set_value("CRM Note", call_log.note, "reference_docname", call_log.reference_docname)
 	call_log.flags.ignore_permissions = True
 	call_log.save()
 	frappe.db.commit()
@@ -145,13 +146,20 @@ def add_note_to_call_log(call_sid, note):
 	frappe.db.set_value("CRM Call Log", call_details.parent_call_sid, "note", note)
 	frappe.db.commit()
 
-def get_lead_from_number(call):
-	"""Get lead from the given number.
+def get_lead_or_deal_from_number(call):
+	"""Get lead/deal from the given number.
 	"""
-	lead = None
+	doctype = "CRM Lead"
+	doc = None
 	if call.type == 'Outgoing':
-		lead = frappe.db.get_value("CRM Lead", { "mobile_no": call.get('to') })
+		doc = frappe.get_cached_value(doctype, { "mobile_no": call.get('to') })
+		if not doc:
+			doctype = "CRM Deal"
+			doc = frappe.get_cached_value(doctype, { "mobile_no": call.get('to') })
 	else:
-		lead = frappe.db.get_value("CRM Lead", { "mobile_no": call.get('from') })
+		doc = frappe.get_cached_value(doctype, { "mobile_no": call.get('from') })
+		if not doc:
+			doctype = "CRM Deal"
+			doc = frappe.get_cached_value(doctype, { "mobile_no": call.get('from') })
 
-	return lead
\ No newline at end of file
+	return doc, doctype
\ No newline at end of file
diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue
index 80b827ecf..369936228 100644
--- a/frontend/src/components/Activities.vue
+++ b/frontend/src/components/Activities.vue
@@ -691,7 +691,7 @@ const calls = createListResource({
     'creation',
     'note',
   ],
-  filters: { lead: doc.value.data.name },
+  filters: { reference_docname: doc.value.data.name },
   orderBy: 'creation desc',
   pageLength: 999,
   auto: true,

From e9694140d15c00c382c9ff89d2f636b860534512 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 7 Nov 2023 14:06:35 +0530
Subject: [PATCH 16/17] fix: hide converted or lead set activity which happen
 behind the scene

---
 crm/api/activities.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/crm/api/activities.py b/crm/api/activities.py
index c761a2119..4f81074a2 100644
--- a/crm/api/activities.py
+++ b/crm/api/activities.py
@@ -47,6 +47,10 @@ def get_deal_activities(name):
 
 		if change := data.get("changed")[0]:
 			field_label, field_option = next(((f.label, f.options) for f in deal_fields_meta if f.fieldname == change[0]), None)
+
+			if field_label == "Lead" or (not change[1] and not change[2]):
+				continue
+
 			activity_type = "changed"
 			data = {
 				"field": change[0],
@@ -54,8 +58,7 @@ def get_deal_activities(name):
 				"old_value": change[1],
 				"value": change[2],
 			}
-			if not change[1] and not change[2]:
-				continue
+
 			if not change[1] and change[2]:
 				activity_type = "added"
 				data = {
@@ -129,6 +132,10 @@ def get_lead_activities(name):
 
 		if change := data.get("changed")[0]:
 			field_label, field_option = next(((f.label, f.options) for f in lead_fields_meta if f.fieldname == change[0]), None)
+
+			if field_label == "Converted" or (not change[1] and not change[2]):
+				continue
+
 			activity_type = "changed"
 			data = {
 				"field": change[0],
@@ -136,8 +143,7 @@ def get_lead_activities(name):
 				"old_value": change[1],
 				"value": change[2],
 			}
-			if not change[1] and not change[2]:
-				continue
+
 			if not change[1] and change[2]:
 				activity_type = "added"
 				data = {

From 5b10e806690d9d30d3a8cba541c498e688b2b2bd Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 7 Nov 2023 16:02:28 +0530
Subject: [PATCH 17/17] fix: added sort fields for deal

---
 crm/fcrm/doctype/crm_deal/crm_deal.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.py b/crm/fcrm/doctype/crm_deal/crm_deal.py
index f36b1cf9c..3cfcf3479 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.py
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.py
@@ -6,4 +6,14 @@
 
 
 class CRMDeal(Document):
-	pass
+	@staticmethod
+	def sort_options():
+		return [
+			{ "label": 'Created', "value": 'creation' },
+			{ "label": 'Modified', "value": 'modified' },
+			{ "label": 'Status', "value": 'status' },
+			{ "label": 'Deal owner', "value": 'deal_owner' },
+			{ "label": 'Organization', "value": 'organization' },
+			{ "label": 'Email', "value": 'email' },
+			{ "label": 'Mobile no', "value": 'mobile_no' },
+		]