From c8c7a95ac0747842cf46108110ab6f263ede79de Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 11:49:42 +0530
Subject: [PATCH 01/26] fix: show edit call log button in call log details
 modal

(cherry picked from commit 693c0869302de05ae2b956542e51caf5ce732b57)
---
 frontend/src/components/Modals/CallLogDetailModal.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/components/Modals/CallLogDetailModal.vue b/frontend/src/components/Modals/CallLogDetailModal.vue
index 739f78ef..c7d336e1 100644
--- a/frontend/src/components/Modals/CallLogDetailModal.vue
+++ b/frontend/src/components/Modals/CallLogDetailModal.vue
@@ -34,7 +34,7 @@
               </template>
             </Dropdown>
             <Button
-              v-if="isManager() && !isMobileView"
+              v-if="!isMobileView"
               variant="ghost"
               class="w-7"
               @click="openCallLogModal"
@@ -174,14 +174,12 @@ import NoteModal from '@/components/Modals/NoteModal.vue'
 import TaskModal from '@/components/Modals/TaskModal.vue'
 import FadedScrollableDiv from '@/components/FadedScrollableDiv.vue'
 import { getCallLogDetail } from '@/utils/callLog'
-import { usersStore } from '@/stores/users'
 import { isMobileView } from '@/composables/settings'
 import { useDocument } from '@/data/document'
 import { FeatherIcon, Dropdown, Avatar, Tooltip, call } from 'frappe-ui'
 import { ref, computed, h, nextTick, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
-const { isManager } = usersStore()
 const router = useRouter()
 
 const show = defineModel()

From 29132f6f23213cf433a5b400a7292420993516ba Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 12:07:44 +0530
Subject: [PATCH 02/26] fix: add default probabilities in deal status

(cherry picked from commit 6d3268a61ecd96710f2c7d1cede33a5cc6f939d6)
---
 .../crm_deal_status/crm_deal_status.json      |  3 ++-
 crm/install.py                                |  7 ++++++
 crm/patches.txt                               |  3 ++-
 .../v1_0/update_deal_status_probabilities.py  | 24 +++++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 crm/patches/v1_0/update_deal_status_probabilities.py

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 ae026c74..d9b5f203 100644
--- a/crm/fcrm/doctype/crm_deal_status/crm_deal_status.json
+++ b/crm/fcrm/doctype/crm_deal_status/crm_deal_status.json
@@ -37,13 +37,14 @@
   {
    "fieldname": "probability",
    "fieldtype": "Percent",
+   "in_list_view": 1,
    "label": "Probability"
   }
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-06-11 13:00:34.518808",
+ "modified": "2025-07-01 12:06:42.937440",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal Status",
diff --git a/crm/install.py b/crm/install.py
index 5ffa5a67..ffa84e90 100644
--- a/crm/install.py
+++ b/crm/install.py
@@ -68,26 +68,32 @@ def add_default_deal_statuses():
 	statuses = {
 		"Qualification": {
 			"color": "gray",
+			"probability": 10,
 			"position": 1,
 		},
 		"Demo/Making": {
 			"color": "orange",
+			"probability": 25,
 			"position": 2,
 		},
 		"Proposal/Quotation": {
 			"color": "blue",
+			"probability": 50,
 			"position": 3,
 		},
 		"Negotiation": {
 			"color": "yellow",
+			"probability": 70,
 			"position": 4,
 		},
 		"Ready to Close": {
 			"color": "purple",
+			"probability": 90,
 			"position": 5,
 		},
 		"Won": {
 			"color": "green",
+			"probability": 100,
 			"position": 6,
 		},
 		"Lost": {
@@ -103,6 +109,7 @@ def add_default_deal_statuses():
 		doc = frappe.new_doc("CRM Deal Status")
 		doc.deal_status = status
 		doc.color = statuses[status]["color"]
+		doc.probability = statuses[status]["probability"]
 		doc.position = statuses[status]["position"]
 		doc.insert()
 
diff --git a/crm/patches.txt b/crm/patches.txt
index ee56be84..484c73dc 100644
--- a/crm/patches.txt
+++ b/crm/patches.txt
@@ -12,4 +12,5 @@ crm.patches.v1_0.create_default_sidebar_fields_layout
 crm.patches.v1_0.update_deal_quick_entry_layout
 crm.patches.v1_0.update_layouts_to_new_format
 crm.patches.v1_0.move_twilio_agent_to_telephony_agent
-crm.patches.v1_0.create_default_scripts # 13-06-2025
\ No newline at end of file
+crm.patches.v1_0.create_default_scripts # 13-06-2025
+crm.patches.v1_0.update_deal_status_probabilities
\ No newline at end of file
diff --git a/crm/patches/v1_0/update_deal_status_probabilities.py b/crm/patches/v1_0/update_deal_status_probabilities.py
new file mode 100644
index 00000000..3460784e
--- /dev/null
+++ b/crm/patches/v1_0/update_deal_status_probabilities.py
@@ -0,0 +1,24 @@
+import frappe
+
+
+def execute():
+	deal_statuses = frappe.get_all("CRM Deal Status", fields=["name", "probability", "deal_status"])
+
+	for status in deal_statuses:
+		if status.probability is None or status.probability == 0:
+			if status.deal_status == "Qualification":
+				probability = 10
+			elif status.deal_status == "Demo/Making":
+				probability = 25
+			elif status.deal_status == "Proposal/Quotation":
+				probability = 50
+			elif status.deal_status == "Negotiation":
+				probability = 70
+			elif status.deal_status == "Ready to Close":
+				probability = 90
+			elif status.deal_status == "Won":
+				probability = 100
+			else:
+				probability = 0
+
+			frappe.db.set_value("CRM Deal Status", status.name, "probability", probability)

From 336ac2ad3465c1503af07d62a9d6ab23de4d5e39 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 12:58:57 +0530
Subject: [PATCH 03/26] fix: prettyDate is not accurate

(cherry picked from commit 611f4cde70d7d4d14f823b1875c57bc75fa66c0f)
---
 frontend/src/utils/index.js | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index c337907e..375d5f51 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -85,7 +85,7 @@ export function prettyDate(date, mini = false) {
   let nowDatetime = dayjs().tz(localTimezone || systemTimezone)
   let diff = nowDatetime.diff(date, 'seconds')
 
-  let dayDiff = Math.floor(diff / 86400)
+  let dayDiff = diff / 86400
 
   if (isNaN(dayDiff)) return ''
 
@@ -93,15 +93,15 @@ export function prettyDate(date, mini = false) {
     // Return short format of time difference
     if (dayDiff < 0) {
       if (Math.abs(dayDiff) < 1) {
-        if (diff < 60) {
+        if (Math.abs(diff) < 60) {
           return __('now')
-        } else if (diff < 3600) {
-          return __('in {0} m', [Math.floor(diff / 60)])
-        } else if (diff < 86400) {
-          return __('in {0} h', [Math.floor(diff / 3600)])
+        } else if (Math.abs(diff) < 3600) {
+          return __('in {0} m', [Math.floor(Math.abs(diff) / 60)])
+        } else if (Math.abs(diff) < 86400) {
+          return __('in {0} h', [Math.floor(Math.abs(diff) / 3600)])
         }
       }
-      if (Math.abs(dayDiff) == 1) {
+      if (Math.abs(dayDiff) >= 1 && Math.abs(dayDiff) < 1.5) {
         return __('tomorrow')
       } else if (Math.abs(dayDiff) < 7) {
         return __('in {0} d', [Math.abs(dayDiff)])
@@ -112,7 +112,7 @@ export function prettyDate(date, mini = false) {
       } else {
         return __('in {0} y', [Math.floor(Math.abs(dayDiff) / 365)])
       }
-    } else if (dayDiff == 0) {
+    } else if (dayDiff >= 0 && dayDiff < 1) {
       if (diff < 60) {
         return __('now')
       } else if (diff < 3600) {
@@ -135,19 +135,19 @@ export function prettyDate(date, mini = false) {
     // Return long format of time difference
     if (dayDiff < 0) {
       if (Math.abs(dayDiff) < 1) {
-        if (diff < 60) {
+        if (Math.abs(diff) < 60) {
           return __('just now')
-        } else if (diff < 120) {
+        } else if (Math.abs(diff) < 120) {
           return __('in 1 minute')
-        } else if (diff < 3600) {
-          return __('in {0} minutes', [Math.floor(diff / 60)])
-        } else if (diff < 7200) {
+        } else if (Math.abs(diff) < 3600) {
+          return __('in {0} minutes', [Math.floor(Math.abs(diff) / 60)])
+        } else if (Math.abs(diff) < 7200) {
           return __('in 1 hour')
-        } else if (diff < 86400) {
-          return __('in {0} hours', [Math.floor(diff / 3600)])
+        } else if (Math.abs(diff) < 86400) {
+          return __('in {0} hours', [Math.floor(Math.abs(diff) / 3600)])
         }
       }
-      if (Math.abs(dayDiff) == 1) {
+      if (Math.abs(dayDiff) >= 1 && Math.abs(dayDiff) < 1.5) {
         return __('tomorrow')
       } else if (Math.abs(dayDiff) < 7) {
         return __('in {0} days', [Math.abs(dayDiff)])
@@ -160,7 +160,7 @@ export function prettyDate(date, mini = false) {
       } else {
         return __('in {0} years', [Math.floor(Math.abs(dayDiff) / 365)])
       }
-    } else if (dayDiff == 0) {
+    } else if (dayDiff >= 0 && dayDiff < 1) {
       if (diff < 60) {
         return __('just now')
       } else if (diff < 120) {

From 2cd08bebb9695982d018e75e8cebe828f2844ea7 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 12:59:53 +0530
Subject: [PATCH 04/26] refactor: moved convert to deal modal into separate
 component

(cherry picked from commit 6320e580ae556df683d50b5145e39039968ad9ad)
---
 frontend/components.d.ts                      |   1 +
 .../components/Modals/ConvertToDealModal.vue  | 227 ++++++++++++++++
 frontend/src/data/document.js                 |   3 +-
 frontend/src/pages/Lead.vue                   | 243 +-----------------
 4 files changed, 243 insertions(+), 231 deletions(-)
 create mode 100644 frontend/src/components/Modals/ConvertToDealModal.vue

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index d4d287e4..984d8e3a 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -56,6 +56,7 @@ declare module 'vue' {
     ContactsIcon: typeof import('./src/components/Icons/ContactsIcon.vue')['default']
     ContactsListView: typeof import('./src/components/ListViews/ContactsListView.vue')['default']
     ConvertIcon: typeof import('./src/components/Icons/ConvertIcon.vue')['default']
+    ConvertToDealModal: typeof import('./src/components/Modals/ConvertToDealModal.vue')['default']
     CountUpTimer: typeof import('./src/components/CountUpTimer.vue')['default']
     CreateDocumentModal: typeof import('./src/components/Modals/CreateDocumentModal.vue')['default']
     CRMLogo: typeof import('./src/components/Icons/CRMLogo.vue')['default']
diff --git a/frontend/src/components/Modals/ConvertToDealModal.vue b/frontend/src/components/Modals/ConvertToDealModal.vue
new file mode 100644
index 00000000..a4a29ac0
--- /dev/null
+++ b/frontend/src/components/Modals/ConvertToDealModal.vue
@@ -0,0 +1,227 @@
+<template>
+  <Dialog
+    v-model="show"
+    :options="{
+      size: 'xl',
+      actions: [
+        {
+          label: __('Convert'),
+          variant: 'solid',
+          onClick: convertToDeal,
+        },
+      ],
+    }"
+  >
+    <template #body-header>
+      <div class="mb-6 flex items-center justify-between">
+        <div>
+          <h3 class="text-2xl font-semibold leading-6 text-ink-gray-9">
+            {{ __('Convert to Deal') }}
+          </h3>
+        </div>
+        <div class="flex items-center gap-1">
+          <Button
+            v-if="isManager() && !isMobileView"
+            variant="ghost"
+            @click="openQuickEntryModal"
+          >
+            <template #icon>
+              <EditIcon class="h-4 w-4" />
+            </template>
+          </Button>
+          <Button icon="x" variant="ghost" @click="show = false" />
+        </div>
+      </div>
+    </template>
+    <template #body-content>
+      <div class="mb-4 flex items-center gap-2 text-ink-gray-5">
+        <OrganizationsIcon class="h-4 w-4" />
+        <label class="block text-base">{{ __('Organization') }}</label>
+      </div>
+      <div class="ml-6 text-ink-gray-9">
+        <div class="flex items-center justify-between text-base">
+          <div>{{ __('Choose Existing') }}</div>
+          <Switch v-model="existingOrganizationChecked" />
+        </div>
+        <Link
+          v-if="existingOrganizationChecked"
+          class="form-control mt-2.5"
+          size="md"
+          :value="existingOrganization"
+          doctype="CRM Organization"
+          @change="(data) => (existingOrganization = data)"
+        />
+        <div v-else class="mt-2.5 text-base">
+          {{
+            __(
+              'New organization will be created based on the data in details section',
+            )
+          }}
+        </div>
+      </div>
+
+      <div class="mb-4 mt-6 flex items-center gap-2 text-ink-gray-5">
+        <ContactsIcon class="h-4 w-4" />
+        <label class="block text-base">{{ __('Contact') }}</label>
+      </div>
+      <div class="ml-6 text-ink-gray-9">
+        <div class="flex items-center justify-between text-base">
+          <div>{{ __('Choose Existing') }}</div>
+          <Switch v-model="existingContactChecked" />
+        </div>
+        <Link
+          v-if="existingContactChecked"
+          class="form-control mt-2.5"
+          size="md"
+          :value="existingContact"
+          doctype="Contact"
+          @change="(data) => (existingContact = data)"
+        />
+        <div v-else class="mt-2.5 text-base">
+          {{ __("New contact will be created based on the person's details") }}
+        </div>
+      </div>
+
+      <div v-if="dealTabs.data?.length" class="h-px w-full border-t my-6" />
+
+      <FieldLayout
+        v-if="dealTabs.data?.length"
+        :tabs="dealTabs.data"
+        :data="deal.doc"
+        doctype="CRM Deal"
+      />
+    </template>
+  </Dialog>
+</template>
+<script setup>
+import OrganizationsIcon from '@/components/Icons/OrganizationsIcon.vue'
+import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
+import EditIcon from '@/components/Icons/EditIcon.vue'
+import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
+import Link from '@/components/Controls/Link.vue'
+import { useDocument } from '@/data/document'
+import { usersStore } from '@/stores/users'
+import { sessionStore } from '@/stores/session'
+import { statusesStore } from '@/stores/statuses'
+import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
+import { isMobileView } from '@/composables/settings'
+import { capture } from '@/telemetry'
+import { useOnboarding } from 'frappe-ui/frappe'
+import { Switch, Dialog, toast, createResource, call } from 'frappe-ui'
+import { ref, computed } from 'vue'
+import { useRouter } from 'vue-router'
+
+const props = defineProps({
+  lead: {
+    type: Object,
+    required: true,
+  },
+})
+
+const show = defineModel()
+
+const router = useRouter()
+
+const { statusOptions, getDealStatus } = statusesStore()
+const { isManager } = usersStore()
+const { user } = sessionStore()
+const { updateOnboardingStep } = useOnboarding('frappecrm')
+
+const existingContactChecked = ref(false)
+const existingOrganizationChecked = ref(false)
+
+const existingContact = ref('')
+const existingOrganization = ref('')
+
+const { triggerConvertToDeal } = useDocument('CRM Lead', props.lead.name)
+const { document: deal } = useDocument('CRM Deal')
+
+async function convertToDeal() {
+  if (existingContactChecked.value && !existingContact.value) {
+    toast.error(__('Please select an existing contact'))
+    return
+  }
+
+  if (existingOrganizationChecked.value && !existingOrganization.value) {
+    toast.error(__('Please select an existing organization'))
+    return
+  }
+
+  if (!existingContactChecked.value && existingContact.value) {
+    existingContact.value = ''
+  }
+
+  if (!existingOrganizationChecked.value && existingOrganization.value) {
+    existingOrganization.value = ''
+  }
+
+  await triggerConvertToDeal?.(props.lead, deal.doc, () => (show.value = false))
+
+  let _deal = await call('crm.fcrm.doctype.crm_lead.crm_lead.convert_to_deal', {
+    lead: props.lead.name,
+    deal: deal.doc,
+    existing_contact: existingContact.value,
+    existing_organization: existingOrganization.value,
+  }).catch((err) => {
+    toast.error(__('Error converting to deal: {0}', [err.messages?.[0]]))
+  })
+  if (_deal) {
+    show.value = false
+    existingContactChecked.value = false
+    existingOrganizationChecked.value = false
+    existingContact.value = ''
+    existingOrganization.value = ''
+    updateOnboardingStep('convert_lead_to_deal', true, false, () => {
+      localStorage.setItem('firstDeal' + user, _deal)
+    })
+    capture('convert_lead_to_deal')
+    router.push({ name: 'Deal', params: { dealId: _deal } })
+  }
+}
+
+const dealStatuses = computed(() => {
+  let statuses = statusOptions('deal')
+  if (!deal.doc?.status) {
+    deal.doc.status = statuses[0].value
+  }
+  return statuses
+})
+
+const dealTabs = createResource({
+  url: 'crm.fcrm.doctype.crm_fields_layout.crm_fields_layout.get_fields_layout',
+  cache: ['RequiredFields', 'CRM Deal'],
+  params: { doctype: 'CRM Deal', type: 'Required Fields' },
+  auto: true,
+  transform: (_tabs) => {
+    let hasFields = false
+    let parsedTabs = _tabs?.forEach((tab) => {
+      tab.sections?.forEach((section) => {
+        section.columns?.forEach((column) => {
+          column.fields?.forEach((field) => {
+            hasFields = true
+            if (field.fieldname == 'status') {
+              field.fieldtype = 'Select'
+              field.options = dealStatuses.value
+              field.prefix = getDealStatus(deal.doc.status).color
+            }
+
+            if (field.fieldtype === 'Table') {
+              deal.doc[field.fieldname] = []
+            }
+          })
+        })
+      })
+    })
+    return hasFields ? parsedTabs : []
+  },
+})
+
+function openQuickEntryModal() {
+  showQuickEntryModal.value = true
+  quickEntryProps.value = {
+    doctype: 'CRM Deal',
+    onlyRequired: true,
+  }
+  show.value = false
+}
+</script>
diff --git a/frontend/src/data/document.js b/frontend/src/data/document.js
index a77174cd..9c15e1d0 100644
--- a/frontend/src/data/document.js
+++ b/frontend/src/data/document.js
@@ -193,8 +193,7 @@ export function useDocument(doctype, docname) {
   async function triggerConvertToDeal() {
     const args = Array.from(arguments)
     const handler = async function () {
-      await (this.convertToDeal?.(...args) ||
-        this.on_convert_to_deal?.(...args))
+      await (this.convertToDeal?.(...args) || this.convert_to_deal?.(...args))
     }
     await trigger(handler)
   }
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 52811b41..1b830319 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -216,108 +216,11 @@
     :errorTitle="errorTitle"
     :errorMessage="errorMessage"
   />
-  <Dialog
+  <ConvertToDealModal
+    v-if="showConvertToDealModal"
     v-model="showConvertToDealModal"
-    :options="{
-      size: 'xl',
-      actions: [
-        {
-          label: __('Convert'),
-          variant: 'solid',
-          onClick: convertToDeal,
-        },
-      ],
-    }"
-  >
-    <template #body-header>
-      <div class="mb-6 flex items-center justify-between">
-        <div>
-          <h3 class="text-2xl font-semibold leading-6 text-ink-gray-9">
-            {{ __('Convert to Deal') }}
-          </h3>
-        </div>
-        <div class="flex items-center gap-1">
-          <Button
-            v-if="isManager() && !isMobileView"
-            variant="ghost"
-            class="w-7"
-            @click="openQuickEntryModal"
-          >
-            <template #icon>
-              <EditIcon class="h-4 w-4" />
-            </template>
-          </Button>
-          <Button
-            variant="ghost"
-            class="w-7"
-            @click="showConvertToDealModal = false"
-          >
-            <template #icon>
-              <FeatherIcon name="x" class="h-4 w-4" />
-            </template>
-          </Button>
-        </div>
-      </div>
-    </template>
-    <template #body-content>
-      <div class="mb-4 flex items-center gap-2 text-ink-gray-5">
-        <OrganizationsIcon class="h-4 w-4" />
-        <label class="block text-base">{{ __('Organization') }}</label>
-      </div>
-      <div class="ml-6 text-ink-gray-9">
-        <div class="flex items-center justify-between text-base">
-          <div>{{ __('Choose Existing') }}</div>
-          <Switch v-model="existingOrganizationChecked" />
-        </div>
-        <Link
-          v-if="existingOrganizationChecked"
-          class="form-control mt-2.5"
-          size="md"
-          :value="existingOrganization"
-          doctype="CRM Organization"
-          @change="(data) => (existingOrganization = data)"
-        />
-        <div v-else class="mt-2.5 text-base">
-          {{
-            __(
-              'New organization will be created based on the data in details section',
-            )
-          }}
-        </div>
-      </div>
-
-      <div class="mb-4 mt-6 flex items-center gap-2 text-ink-gray-5">
-        <ContactsIcon class="h-4 w-4" />
-        <label class="block text-base">{{ __('Contact') }}</label>
-      </div>
-      <div class="ml-6 text-ink-gray-9">
-        <div class="flex items-center justify-between text-base">
-          <div>{{ __('Choose Existing') }}</div>
-          <Switch v-model="existingContactChecked" />
-        </div>
-        <Link
-          v-if="existingContactChecked"
-          class="form-control mt-2.5"
-          size="md"
-          :value="existingContact"
-          doctype="Contact"
-          @change="(data) => (existingContact = data)"
-        />
-        <div v-else class="mt-2.5 text-base">
-          {{ __("New contact will be created based on the person's details") }}
-        </div>
-      </div>
-
-      <div v-if="dealTabs.data?.length" class="h-px w-full border-t my-6" />
-
-      <FieldLayout
-        v-if="dealTabs.data?.length"
-        :tabs="dealTabs.data"
-        :data="deal"
-        doctype="CRM Deal"
-      />
-    </template>
-  </Dialog>
+    :lead="lead.data"
+  />
   <FilesUploader
     v-if="lead.data?.name"
     v-model="showFilesUploader"
@@ -354,40 +257,28 @@ import WhatsAppIcon from '@/components/Icons/WhatsAppIcon.vue'
 import IndicatorIcon from '@/components/Icons/IndicatorIcon.vue'
 import CameraIcon from '@/components/Icons/CameraIcon.vue'
 import LinkIcon from '@/components/Icons/LinkIcon.vue'
-import OrganizationsIcon from '@/components/Icons/OrganizationsIcon.vue'
-import ContactsIcon from '@/components/Icons/ContactsIcon.vue'
 import AttachmentIcon from '@/components/Icons/AttachmentIcon.vue'
-import EditIcon from '@/components/Icons/EditIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import Activities from '@/components/Activities/Activities.vue'
 import AssignTo from '@/components/AssignTo.vue'
 import FilesUploader from '@/components/FilesUploader/FilesUploader.vue'
-import Link from '@/components/Controls/Link.vue'
 import SidePanelLayout from '@/components/SidePanelLayout.vue'
-import FieldLayout from '@/components/FieldLayout/FieldLayout.vue'
 import SLASection from '@/components/SLASection.vue'
 import CustomActions from '@/components/CustomActions.vue'
+import ConvertToDealModal from '@/components/Modals/ConvertToDealModal.vue'
 import {
   openWebsite,
   setupCustomizations,
   copyToClipboard,
   validateIsImageFile,
 } from '@/utils'
-import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
 import { getView } from '@/utils/view'
 import { getSettings } from '@/stores/settings'
-import { sessionStore } from '@/stores/session'
-import { usersStore } from '@/stores/users'
 import { globalStore } from '@/stores/global'
 import { statusesStore } from '@/stores/statuses'
 import { getMeta } from '@/stores/meta'
 import { useDocument } from '@/data/document'
-import {
-  whatsappEnabled,
-  callEnabled,
-  isMobileView,
-} from '@/composables/settings'
-import { capture } from '@/telemetry'
+import { whatsappEnabled, callEnabled } from '@/composables/settings'
 import {
   createResource,
   FileUploader,
@@ -395,26 +286,20 @@ import {
   Tooltip,
   Avatar,
   Tabs,
-  Switch,
   Breadcrumbs,
   call,
   usePageMeta,
   toast,
 } from 'frappe-ui'
-import { useOnboarding } from 'frappe-ui/frappe'
-import { ref, reactive, computed, onMounted, watch, nextTick } from 'vue'
+import { ref, computed, onMounted, watch, nextTick } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useActiveTabManager } from '@/composables/useActiveTabManager'
 
 const { brand } = getSettings()
-const { user } = sessionStore()
-const { isManager } = usersStore()
 const { $dialog, $socket, makeCall } = globalStore()
-const { statusOptions, getLeadStatus, getDealStatus } = statusesStore()
+const { statusOptions, getLeadStatus } = statusesStore()
 const { doctypeMeta } = getMeta('CRM Lead')
 
-const { updateOnboardingStep } = useOnboarding('frappecrm')
-
 const route = useRoute()
 const router = useRouter()
 
@@ -428,6 +313,12 @@ const props = defineProps({
 const errorTitle = ref('')
 const errorMessage = ref('')
 const showDeleteLinkedDocModal = ref(false)
+const showConvertToDealModal = ref(false)
+
+const { triggerOnChange, assignees, document } = useDocument(
+  'CRM Lead',
+  props.leadId,
+)
 
 const lead = createResource({
   url: 'crm.fcrm.doctype.crm_lead.api.get_lead',
@@ -630,64 +521,6 @@ async function deleteLeadWithModal(name) {
   showDeleteLinkedDocModal.value = true
 }
 
-// Convert to Deal
-const showConvertToDealModal = ref(false)
-const existingContactChecked = ref(false)
-const existingOrganizationChecked = ref(false)
-
-const existingContact = ref('')
-const existingOrganization = ref('')
-
-const { triggerConvertToDeal, triggerOnChange, assignees, document } =
-  useDocument('CRM Lead', props.leadId)
-
-async function convertToDeal() {
-  if (existingContactChecked.value && !existingContact.value) {
-    toast.error(__('Please select an existing contact'))
-    return
-  }
-
-  if (existingOrganizationChecked.value && !existingOrganization.value) {
-    toast.error(__('Please select an existing organization'))
-    return
-  }
-
-  if (!existingContactChecked.value && existingContact.value) {
-    existingContact.value = ''
-  }
-
-  if (!existingOrganizationChecked.value && existingOrganization.value) {
-    existingOrganization.value = ''
-  }
-
-  await triggerConvertToDeal?.(
-    lead.data,
-    deal,
-    () => (showConvertToDealModal.value = false),
-  )
-
-  let _deal = await call('crm.fcrm.doctype.crm_lead.crm_lead.convert_to_deal', {
-    lead: lead.data.name,
-    deal,
-    existing_contact: existingContact.value,
-    existing_organization: existingOrganization.value,
-  }).catch((err) => {
-    toast.error(__('Error converting to deal: {0}', [err.messages?.[0]]))
-  })
-  if (_deal) {
-    showConvertToDealModal.value = false
-    existingContactChecked.value = false
-    existingOrganizationChecked.value = false
-    existingContact.value = ''
-    existingOrganization.value = ''
-    updateOnboardingStep('convert_lead_to_deal', true, false, () => {
-      localStorage.setItem('firstDeal' + user, _deal)
-    })
-    capture('convert_lead_to_deal')
-    router.push({ name: 'Deal', params: { dealId: _deal } })
-  }
-}
-
 const activities = ref(null)
 
 function openEmailBox() {
@@ -698,54 +531,6 @@ function openEmailBox() {
   nextTick(() => (activities.value.emailBox.show = true))
 }
 
-const deal = reactive({})
-
-const dealStatuses = computed(() => {
-  let statuses = statusOptions('deal')
-  if (!deal.status) {
-    deal.status = statuses[0].value
-  }
-  return statuses
-})
-
-const dealTabs = createResource({
-  url: 'crm.fcrm.doctype.crm_fields_layout.crm_fields_layout.get_fields_layout',
-  cache: ['RequiredFields', 'CRM Deal'],
-  params: { doctype: 'CRM Deal', type: 'Required Fields' },
-  auto: true,
-  transform: (_tabs) => {
-    let hasFields = false
-    let parsedTabs = _tabs?.forEach((tab) => {
-      tab.sections?.forEach((section) => {
-        section.columns?.forEach((column) => {
-          column.fields?.forEach((field) => {
-            hasFields = true
-            if (field.fieldname == 'status') {
-              field.fieldtype = 'Select'
-              field.options = dealStatuses.value
-              field.prefix = getDealStatus(deal.status).color
-            }
-
-            if (field.fieldtype === 'Table') {
-              deal[field.fieldname] = []
-            }
-          })
-        })
-      })
-    })
-    return hasFields ? parsedTabs : []
-  },
-})
-
-function openQuickEntryModal() {
-  showQuickEntryModal.value = true
-  quickEntryProps.value = {
-    doctype: 'CRM Deal',
-    onlyRequired: true,
-  }
-  showConvertToDealModal.value = false
-}
-
 function reloadAssignees(data) {
   if (data?.hasOwnProperty('lead_owner')) {
     assignees.reload()

From e3510b0e9cc9f317e8935db2790f0e9a137cad6f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 13:16:40 +0530
Subject: [PATCH 05/26] fix: added default probability to Lost status

(cherry picked from commit 4d3fe722e86a1e91e056418a173ad30f1a1b6c63)
---
 crm/install.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crm/install.py b/crm/install.py
index ffa84e90..9f8e617d 100644
--- a/crm/install.py
+++ b/crm/install.py
@@ -98,6 +98,7 @@ def add_default_deal_statuses():
 		},
 		"Lost": {
 			"color": "red",
+			"probability": 0,
 			"position": 7,
 		},
 	}

From 47002deed6c2781b4f935fe7f57c2112641131c2 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 15:05:37 +0530
Subject: [PATCH 06/26] fix: made deal value mandatory if forecasting is
 enabled

(cherry picked from commit 4f58aa110a39b431e58d1fd86c2dfe8e41d0034c)
---
 crm/fcrm/doctype/crm_deal/crm_deal.py             | 10 +++++++++-
 crm/fcrm/doctype/fcrm_settings/fcrm_settings.json |  4 ++--
 crm/fcrm/doctype/fcrm_settings/fcrm_settings.py   | 12 ++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.py b/crm/fcrm/doctype/crm_deal/crm_deal.py
index b7e4ec83..9afab159 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.py
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.py
@@ -24,7 +24,7 @@ class CRMDeal(Document):
 			self.assign_agent(self.deal_owner)
 		if self.has_value_changed("status"):
 			add_status_change_log(self)
-		self.update_close_date()
+		self.validate_forcasting_fields()
 
 	def after_insert(self):
 		if self.deal_owner:
@@ -141,6 +141,14 @@ class CRMDeal(Document):
 		if self.status == "Won" and not self.close_date:
 			self.close_date = frappe.utils.nowdate()
 
+	def validate_forcasting_fields(self):
+		self.update_close_date()
+		if frappe.db.get_single_value("FCRM Settings", "enable_forecasting"):
+			if not self.deal_value or self.deal_value == 0:
+				frappe.throw(_("Deal Value is required."), frappe.MandatoryError)
+			if not self.close_date:
+				frappe.throw(_("Close Date is required."), frappe.MandatoryError)
+
 	@staticmethod
 	def default_list_data():
 		columns = [
diff --git a/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json b/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json
index de27e245..e679b023 100644
--- a/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json
+++ b/crm/fcrm/doctype/fcrm_settings/fcrm_settings.json
@@ -60,7 +60,7 @@
   },
   {
    "default": "0",
-   "description": "It will make deal's \"Expected Closure Date\" mandatory to get accurate forecasting insights",
+   "description": "It will make deal's \"Close Date\" & \"Deal Value\" mandatory to get accurate forecasting insights",
    "fieldname": "enable_forecasting",
    "fieldtype": "Check",
    "label": "Enable Forecasting"
@@ -69,7 +69,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-06-11 19:12:16.762499",
+ "modified": "2025-07-01 13:20:48.757603",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "FCRM Settings",
diff --git a/crm/fcrm/doctype/fcrm_settings/fcrm_settings.py b/crm/fcrm/doctype/fcrm_settings/fcrm_settings.py
index f22114f1..1460c265 100644
--- a/crm/fcrm/doctype/fcrm_settings/fcrm_settings.py
+++ b/crm/fcrm/doctype/fcrm_settings/fcrm_settings.py
@@ -39,6 +39,11 @@ class FCRMSettings(Document):
 					"reqd",
 					"close_date",
 				)
+				delete_property_setter(
+					"CRM Deal",
+					"reqd",
+					"deal_value",
+				)
 			else:
 				make_property_setter(
 					"CRM Deal",
@@ -47,6 +52,13 @@ class FCRMSettings(Document):
 					1 if self.enable_forecasting else 0,
 					"Check",
 				)
+				make_property_setter(
+					"CRM Deal",
+					"deal_value",
+					"reqd",
+					1 if self.enable_forecasting else 0,
+					"Check",
+				)
 
 
 def get_standard_dropdown_items():

From 08243530e7ff6b82c7d9f6e836a36b39bf03b9bf Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 15:06:02 +0530
Subject: [PATCH 07/26] fix: mandatory error

(cherry picked from commit 4c70b1a06bff81aac6baacffe34d624c7e3c4b86)
---
 frontend/src/components/Modals/AddressModal.vue | 5 ++++-
 frontend/src/components/Modals/CallLogModal.vue | 5 ++++-
 frontend/src/data/document.js                   | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/Modals/AddressModal.vue b/frontend/src/components/Modals/AddressModal.vue
index 444490c4..c1e9ba20 100644
--- a/frontend/src/components/Modals/AddressModal.vue
+++ b/frontend/src/components/Modals/AddressModal.vue
@@ -121,7 +121,10 @@ const callBacks = {
     loading.value = false
     if (err.exc_type == 'MandatoryError') {
       const errorMessage = err.messages
-        .map((msg) => msg.split(': ')[2].trim())
+        .map((msg) => {
+          let arr = msg.split(': ')
+          return arr[arr.length - 1].trim()
+        })
         .join(', ')
       error.value = __('These fields are required: {0}', [errorMessage])
       return
diff --git a/frontend/src/components/Modals/CallLogModal.vue b/frontend/src/components/Modals/CallLogModal.vue
index 1c90541f..dab2374c 100644
--- a/frontend/src/components/Modals/CallLogModal.vue
+++ b/frontend/src/components/Modals/CallLogModal.vue
@@ -124,7 +124,10 @@ const callBacks = {
     loading.value = false
     if (err.exc_type == 'MandatoryError') {
       const errorMessage = err.messages
-        .map((msg) => msg.split(': ')[2].trim())
+        .map((msg) => {
+          let arr = msg.split(': ')
+          return arr[arr.length - 1].trim()
+        })
         .join(', ')
       error.value = __('These fields are required: {0}', [errorMessage])
       return
diff --git a/frontend/src/data/document.js b/frontend/src/data/document.js
index 9c15e1d0..d5893552 100644
--- a/frontend/src/data/document.js
+++ b/frontend/src/data/document.js
@@ -26,7 +26,10 @@ export function useDocument(doctype, docname) {
             let errorMessage = __('Error updating document')
             if (err.exc_type == 'MandatoryError') {
               const fieldName = err.messages
-                .map((msg) => msg.split(': ')[2].trim())
+                .map((msg) => {
+                  let arr = msg.split(': ')
+                  return arr[arr.length - 1].trim()
+                })
                 .join(', ')
               errorMessage = __('Mandatory field error: {0}', [fieldName])
             }

From 57fb8b3abec13fe593ced96b3950f6f2f4684915 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 16:04:40 +0530
Subject: [PATCH 08/26] fix: show error message on convert to deal modal

(cherry picked from commit adc22efcb1e20eda3c0c3b897e5c5456ccf67b98)
---
 .../components/Modals/ConvertToDealModal.vue  | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Modals/ConvertToDealModal.vue b/frontend/src/components/Modals/ConvertToDealModal.vue
index a4a29ac0..427d688f 100644
--- a/frontend/src/components/Modals/ConvertToDealModal.vue
+++ b/frontend/src/components/Modals/ConvertToDealModal.vue
@@ -90,6 +90,7 @@
         :data="deal.doc"
         doctype="CRM Deal"
       />
+      <ErrorMessage class="mt-4" :message="error" />
     </template>
   </Dialog>
 </template>
@@ -107,7 +108,7 @@ import { showQuickEntryModal, quickEntryProps } from '@/composables/modals'
 import { isMobileView } from '@/composables/settings'
 import { capture } from '@/telemetry'
 import { useOnboarding } from 'frappe-ui/frappe'
-import { Switch, Dialog, toast, createResource, call } from 'frappe-ui'
+import { Switch, Dialog, createResource, call } from 'frappe-ui'
 import { ref, computed } from 'vue'
 import { useRouter } from 'vue-router'
 
@@ -132,18 +133,21 @@ const existingOrganizationChecked = ref(false)
 
 const existingContact = ref('')
 const existingOrganization = ref('')
+const error = ref('')
 
 const { triggerConvertToDeal } = useDocument('CRM Lead', props.lead.name)
 const { document: deal } = useDocument('CRM Deal')
 
 async function convertToDeal() {
+  error.value = ''
+
   if (existingContactChecked.value && !existingContact.value) {
-    toast.error(__('Please select an existing contact'))
+    error.value = __('Please select an existing contact')
     return
   }
 
   if (existingOrganizationChecked.value && !existingOrganization.value) {
-    toast.error(__('Please select an existing organization'))
+    error.value = __('Please select an existing organization')
     return
   }
 
@@ -163,7 +167,22 @@ async function convertToDeal() {
     existing_contact: existingContact.value,
     existing_organization: existingOrganization.value,
   }).catch((err) => {
-    toast.error(__('Error converting to deal: {0}', [err.messages?.[0]]))
+    if (err.exc_type == 'MandatoryError') {
+      const errorMessage = err.messages
+        .map((msg) => {
+          let arr = msg.split(': ')
+          return arr[arr.length - 1].trim()
+        })
+        .join(', ')
+
+      if (errorMessage.toLowerCase().includes('required')) {
+        error.value = __(errorMessage)
+      } else {
+        error.value = __('{0} is required', [errorMessage])
+      }
+      return
+    }
+    error.value = __('Error converting to deal: {0}', [err.messages?.[0]])
   })
   if (_deal) {
     show.value = false
@@ -171,6 +190,7 @@ async function convertToDeal() {
     existingOrganizationChecked.value = false
     existingContact.value = ''
     existingOrganization.value = ''
+    error.value = ''
     updateOnboardingStep('convert_lead_to_deal', true, false, () => {
       localStorage.setItem('firstDeal' + user, _deal)
     })

From b1ea3edcebd8dbabf96076f1304b1a38dcc24603 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 16:05:08 +0530
Subject: [PATCH 09/26] fix: add mandatory fields in convert to deal modal if
 not added

(cherry picked from commit 17fdbb05cedad890631465d1ad64fbc502dd00c9)
---
 .../crm_fields_layout/crm_fields_layout.py    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py b/crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py
index 1fd85824..9274e857 100644
--- a/crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py
+++ b/crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py
@@ -47,6 +47,13 @@ def get_fields_layout(doctype: str, type: str, parent_doctype: str | None = None
 	fields = frappe.get_meta(doctype).fields
 	fields = [field for field in fields if field.fieldname in allowed_fields]
 
+	required_fields = []
+
+	if type == "Required Fields":
+		required_fields = [
+			field for field in frappe.get_meta(doctype, False).fields if field.reqd and not field.default
+		]
+
 	for tab in tabs:
 		for section in tab.get("sections"):
 			if section.get("columns"):
@@ -60,6 +67,32 @@ def get_fields_layout(doctype: str, type: str, parent_doctype: str | None = None
 						handle_perm_level_restrictions(field, doctype, parent_doctype)
 						column["fields"][column.get("fields").index(field["fieldname"])] = field
 
+						# remove field from required_fields if it is already present
+						if (
+							type == "Required Fields"
+							and field.reqd
+							and any(f.get("fieldname") == field.get("fieldname") for f in required_fields)
+						):
+							required_fields = [
+								f for f in required_fields if f.get("fieldname") != field.get("fieldname")
+							]
+
+	if type == "Required Fields" and required_fields and tabs:
+		tabs[-1].get("sections").append(
+			{
+				"label": "Required Fields",
+				"name": "required_fields_section_" + str(random_string(4)),
+				"opened": True,
+				"hideLabel": True,
+				"columns": [
+					{
+						"name": "required_fields_column_" + str(random_string(4)),
+						"fields": [field.as_dict() for field in required_fields],
+					}
+				],
+			}
+		)
+
 	return tabs or []
 
 

From 4cfe106144790d72cb40b6802787c390482e1fab Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 16:37:04 +0530
Subject: [PATCH 10/26] fix: show forcasted sales section in sidepanel if
 forecasting is enabled

(cherry picked from commit 485360f29194a95749b1a6fd27108bec03b37b50)
---
 .../crm_fields_layout/crm_fields_layout.py    | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py b/crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py
index 9274e857..34a361e9 100644
--- a/crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py
+++ b/crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py
@@ -116,6 +116,8 @@ def get_sidepanel_sections(doctype):
 	fields = frappe.get_meta(doctype).fields
 	fields = [field for field in fields if field.fieldtype not in not_allowed_fieldtypes]
 
+	add_forecasting_section(layout, doctype)
+
 	for section in layout:
 		section["name"] = section.get("name") or section.get("label")
 		for column in section.get("columns") if section.get("columns") else []:
@@ -133,6 +135,38 @@ def get_sidepanel_sections(doctype):
 	return layout
 
 
+def add_forecasting_section(layout, doctype):
+	if (
+		doctype == "CRM Deal"
+		and frappe.db.get_single_value("FCRM Settings", "enable_forecasting")
+		and not any(section.get("name") == "forecasted_sales_section" for section in layout)
+	):
+		contacts_section_index = next(
+			(
+				i
+				for i, section in enumerate(layout)
+				if section.get("name") == "contacts_section" or section.get("label") == "Contacts"
+			),
+			None,
+		)
+
+		if contacts_section_index is not None:
+			layout.insert(
+				contacts_section_index + 1,
+				{
+					"name": "forecasted_sales_section",
+					"label": "Forecasted Sales",
+					"opened": True,
+					"columns": [
+						{
+							"name": "column_" + str(random_string(4)),
+							"fields": ["close_date", "probability", "deal_value"],
+						}
+					],
+				},
+			)
+
+
 def handle_perm_level_restrictions(field, doctype, parent_doctype=None):
 	if field.permlevel == 0:
 		return

From 59e762d658b012b66a856c22582415a28b3655b5 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 19:20:04 +0530
Subject: [PATCH 11/26] fix: show absolute day count not in decimels

(cherry picked from commit a7dc5e05b3b5dff845b8c5cf32b3dc540e85e9ad)
---
 frontend/src/utils/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 375d5f51..44e18381 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -104,7 +104,7 @@ export function prettyDate(date, mini = false) {
       if (Math.abs(dayDiff) >= 1 && Math.abs(dayDiff) < 1.5) {
         return __('tomorrow')
       } else if (Math.abs(dayDiff) < 7) {
-        return __('in {0} d', [Math.abs(dayDiff)])
+        return __('in {0} d', [Math.floor(Math.abs(dayDiff))])
       } else if (Math.abs(dayDiff) < 31) {
         return __('in {0} w', [Math.floor(Math.abs(dayDiff) / 7)])
       } else if (Math.abs(dayDiff) < 365) {
@@ -121,6 +121,7 @@ export function prettyDate(date, mini = false) {
         return __('{0} h', [Math.floor(diff / 3600)])
       }
     } else {
+      dayDiff = Math.floor(dayDiff)
       if (dayDiff < 7) {
         return __('{0} d', [dayDiff])
       } else if (dayDiff < 31) {
@@ -150,7 +151,7 @@ export function prettyDate(date, mini = false) {
       if (Math.abs(dayDiff) >= 1 && Math.abs(dayDiff) < 1.5) {
         return __('tomorrow')
       } else if (Math.abs(dayDiff) < 7) {
-        return __('in {0} days', [Math.abs(dayDiff)])
+        return __('in {0} days', [Math.floor(Math.abs(dayDiff))])
       } else if (Math.abs(dayDiff) < 31) {
         return __('in {0} weeks', [Math.floor(Math.abs(dayDiff) / 7)])
       } else if (Math.abs(dayDiff) < 365) {
@@ -173,6 +174,7 @@ export function prettyDate(date, mini = false) {
         return __('{0} hours ago', [Math.floor(diff / 3600)])
       }
     } else {
+      dayDiff = Math.floor(dayDiff)
       if (dayDiff == 1) {
         return __('yesterday')
       } else if (dayDiff < 7) {

From 252fe05edc0768e2d59f9e400d0dcfa773918282 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 30 Jun 2025 17:43:42 +0530
Subject: [PATCH 12/26] feat: created lost reason doctype

(cherry picked from commit 5d01b88a1e949f8388d8ca9f3e6ef62fe30a977a)
---
 crm/fcrm/doctype/crm_deal/crm_deal.json       |  9 ++-
 .../crm_lead_source/crm_lead_source.json      | 17 +++-
 crm/fcrm/doctype/crm_lost_reason/__init__.py  |  0
 .../crm_lost_reason/crm_lost_reason.js        |  8 ++
 .../crm_lost_reason/crm_lost_reason.json      | 79 +++++++++++++++++++
 .../crm_lost_reason/crm_lost_reason.py        |  9 +++
 .../crm_lost_reason/test_crm_lost_reason.py   | 30 +++++++
 7 files changed, 148 insertions(+), 4 deletions(-)
 create mode 100644 crm/fcrm/doctype/crm_lost_reason/__init__.py
 create mode 100644 crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.js
 create mode 100644 crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.json
 create mode 100644 crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.py
 create mode 100644 crm/fcrm/doctype/crm_lost_reason/test_crm_lost_reason.py

diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
index bbef186d..6344d6d9 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.json
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -14,6 +14,7 @@
   "column_break_ijan",
   "status",
   "deal_owner",
+  "lost_reason",
   "section_break_jgpm",
   "probability",
   "deal_value",
@@ -391,12 +392,18 @@
   {
    "fieldname": "column_break_kpxa",
    "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "lost_reason",
+   "fieldtype": "Link",
+   "label": "Lost Reason",
+   "options": "CRM Lost Reason"
   }
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-06-16 11:42:49.413483",
+ "modified": "2025-06-30 17:40:28.673539",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",
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 416ccd7e..87fb72f3 100644
--- a/crm/fcrm/doctype/crm_lead_source/crm_lead_source.json
+++ b/crm/fcrm/doctype/crm_lead_source/crm_lead_source.json
@@ -27,9 +27,10 @@
    "label": "Details"
   }
  ],
+ "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-01-02 22:13:30.498404",
+ "modified": "2025-06-30 16:53:51.721752",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Lead Source",
@@ -44,7 +45,7 @@
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "Sales User",
+   "role": "System Manager",
    "share": 1,
    "write": 1
   },
@@ -60,6 +61,15 @@
    "share": 1,
    "write": 1
   },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "share": 1
+  },
   {
    "email": 1,
    "export": 1,
@@ -71,7 +81,8 @@
   }
  ],
  "quick_entry": 1,
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
\ No newline at end of file
+}
diff --git a/crm/fcrm/doctype/crm_lost_reason/__init__.py b/crm/fcrm/doctype/crm_lost_reason/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.js b/crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.js
new file mode 100644
index 00000000..effd824a
--- /dev/null
+++ b/crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+// frappe.ui.form.on("CRM Lost Reason", {
+// 	refresh(frm) {
+
+// 	},
+// });
diff --git a/crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.json b/crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.json
new file mode 100644
index 00000000..ce774060
--- /dev/null
+++ b/crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.json
@@ -0,0 +1,79 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:lost_reason",
+ "creation": "2025-06-30 16:51:31.082360",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "lost_reason",
+  "description"
+ ],
+ "fields": [
+  {
+   "fieldname": "lost_reason",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Lost Reason",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "label": "Description"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2025-06-30 16:59:15.094049",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Lost Reason",
+ "naming_rule": "By fieldname",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
diff --git a/crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.py b/crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.py
new file mode 100644
index 00000000..b43a399c
--- /dev/null
+++ b/crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.py
@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class CRMLostReason(Document):
+	pass
diff --git a/crm/fcrm/doctype/crm_lost_reason/test_crm_lost_reason.py b/crm/fcrm/doctype/crm_lost_reason/test_crm_lost_reason.py
new file mode 100644
index 00000000..2f353477
--- /dev/null
+++ b/crm/fcrm/doctype/crm_lost_reason/test_crm_lost_reason.py
@@ -0,0 +1,30 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase, UnitTestCase
+
+
+# On IntegrationTestCase, the doctype test records and all
+# link-field test record dependencies are recursively loaded
+# Use these module variables to add/remove to/from that list
+EXTRA_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+IGNORE_TEST_RECORD_DEPENDENCIES = []  # eg. ["User"]
+
+
+class UnitTestCRMLostReason(UnitTestCase):
+	"""
+	Unit tests for CRMLostReason.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class IntegrationTestCRMLostReason(IntegrationTestCase):
+	"""
+	Integration tests for CRMLostReason.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass

From 6aa4a03b0f3e8073b51ded14a88bfa059be0d960 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 1 Jul 2025 16:53:40 +0530
Subject: [PATCH 13/26] chore: resolved conflict

(cherry picked from commit 92d728072843b1449cb2e2e626cde7a218e68530)
---
 crm/fcrm/doctype/crm_deal/crm_deal.json | 11 ++++++++++-
 crm/fcrm/doctype/crm_deal/crm_deal.py   | 11 +++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
index 6344d6d9..121c5e95 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.json
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -15,6 +15,7 @@
   "status",
   "deal_owner",
   "lost_reason",
+  "other_lost_reason",
   "section_break_jgpm",
   "probability",
   "deal_value",
@@ -397,13 +398,21 @@
    "fieldname": "lost_reason",
    "fieldtype": "Link",
    "label": "Lost Reason",
+   "mandatory_depends_on": "eval: doc.status == \"Lost\"",
    "options": "CRM Lost Reason"
+  },
+  {
+   "depends_on": "eval: doc.lost_reason == \"Other\"",
+   "fieldname": "other_lost_reason",
+   "fieldtype": "Data",
+   "label": "Specify Other Reason",
+   "mandatory_depends_on": "eval: doc.lost_reason == \"Other\""
   }
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-06-30 17:40:28.673539",
+ "modified": "2025-06-30 17:53:23.408301",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",
diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.py b/crm/fcrm/doctype/crm_deal/crm_deal.py
index 9afab159..97b09523 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.py
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.py
@@ -25,6 +25,7 @@ class CRMDeal(Document):
 		if self.has_value_changed("status"):
 			add_status_change_log(self)
 		self.validate_forcasting_fields()
+		self.validate_lost_reason()
 
 	def after_insert(self):
 		if self.deal_owner:
@@ -149,6 +150,16 @@ class CRMDeal(Document):
 			if not self.close_date:
 				frappe.throw(_("Close Date is required."), frappe.MandatoryError)
 
+	def validate_lost_reason(self):
+		"""
+		Validate the lost reason if the status is set to "Lost".
+		"""
+		if self.status == "Lost":
+			if not self.lost_reason:
+				frappe.throw(_("Please specify a reason for losing the deal."), frappe.ValidationError)
+			elif self.lost_reason == "Other" and not self.other_lost_reason:
+				frappe.throw(_("Please specify the reason for losing the deal."), frappe.ValidationError)
+
 	@staticmethod
 	def default_list_data():
 		columns = [

From e0cdeea2f9c6b223ad65ac98c2640faf102068ba Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 11:10:53 +0530
Subject: [PATCH 14/26] fix: made lost notes as text and non mandatory if lost
 reason is not Other

(cherry picked from commit 97b2253e9d464e5a25dd1de8ffadd9d513cb3fda)
---
 crm/fcrm/doctype/crm_deal/crm_deal.json | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.json b/crm/fcrm/doctype/crm_deal/crm_deal.json
index 121c5e95..6b7ce0fe 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.json
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.json
@@ -15,7 +15,7 @@
   "status",
   "deal_owner",
   "lost_reason",
-  "other_lost_reason",
+  "lost_notes",
   "section_break_jgpm",
   "probability",
   "deal_value",
@@ -402,17 +402,16 @@
    "options": "CRM Lost Reason"
   },
   {
-   "depends_on": "eval: doc.lost_reason == \"Other\"",
-   "fieldname": "other_lost_reason",
-   "fieldtype": "Data",
-   "label": "Specify Other Reason",
+   "fieldname": "lost_notes",
+   "fieldtype": "Text",
+   "label": "Lost Notes",
    "mandatory_depends_on": "eval: doc.lost_reason == \"Other\""
   }
  ],
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-06-30 17:53:23.408301",
+ "modified": "2025-07-02 11:07:50.192089",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",

From 040692c13cc4aea846062b4ca8e55d1359543988 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 13:58:51 +0530
Subject: [PATCH 15/26] fix: removed unused triggerOnChange

(cherry picked from commit 7730e46cfc2c0886c9bb1237d1558c31a05be712)
---
 frontend/src/components/Modals/DealModal.vue | 8 ++------
 frontend/src/components/Modals/LeadModal.vue | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Modals/DealModal.vue b/frontend/src/components/Modals/DealModal.vue
index 7ccb128f..c9436e76 100644
--- a/frontend/src/components/Modals/DealModal.vue
+++ b/frontend/src/components/Modals/DealModal.vue
@@ -98,11 +98,7 @@ const show = defineModel()
 const router = useRouter()
 const error = ref(null)
 
-const {
-  document: deal,
-  triggerOnChange,
-  triggerOnBeforeCreate,
-} = useDocument('CRM Deal')
+const { document: deal, triggerOnBeforeCreate } = useDocument('CRM Deal')
 
 const hasOrganizationSections = ref(true)
 const hasContactSections = ref(true)
@@ -172,7 +168,7 @@ const tabs = createResource({
 })
 
 const dealStatuses = computed(() => {
-  let statuses = statusOptions('deal', null, [], triggerOnChange)
+  let statuses = statusOptions('deal')
   if (!deal.doc.status) {
     deal.doc.status = statuses[0].value
   }
diff --git a/frontend/src/components/Modals/LeadModal.vue b/frontend/src/components/Modals/LeadModal.vue
index 7c2dc728..9eb6ce50 100644
--- a/frontend/src/components/Modals/LeadModal.vue
+++ b/frontend/src/components/Modals/LeadModal.vue
@@ -74,14 +74,10 @@ const router = useRouter()
 const error = ref(null)
 const isLeadCreating = ref(false)
 
-const {
-  document: lead,
-  triggerOnChange,
-  triggerOnBeforeCreate,
-} = useDocument('CRM Lead')
+const { document: lead, triggerOnBeforeCreate } = useDocument('CRM Lead')
 
 const leadStatuses = computed(() => {
-  let statuses = statusOptions('lead', null, [], triggerOnChange)
+  let statuses = statusOptions('lead')
   if (!lead.doc.status) {
     lead.doc.status = statuses?.[0]?.value
   }

From 6647a834859db155af8c974d26505e7eee2c35e3 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 13:59:34 +0530
Subject: [PATCH 16/26] fix: renamed other_lost_reason to lost_notes

(cherry picked from commit 5bbec00803e299c3d997bd5d3335ef2a4ab78028)
---
 crm/fcrm/doctype/crm_deal/crm_deal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.py b/crm/fcrm/doctype/crm_deal/crm_deal.py
index 97b09523..3022e6a7 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.py
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.py
@@ -157,7 +157,7 @@ class CRMDeal(Document):
 		if self.status == "Lost":
 			if not self.lost_reason:
 				frappe.throw(_("Please specify a reason for losing the deal."), frappe.ValidationError)
-			elif self.lost_reason == "Other" and not self.other_lost_reason:
+			elif self.lost_reason == "Other" and not self.lost_notes:
 				frappe.throw(_("Please specify the reason for losing the deal."), frappe.ValidationError)
 
 	@staticmethod

From 9b315c2e0ccb431e44e5d48963214e058711eb15 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 14:10:14 +0530
Subject: [PATCH 17/26] refactor: statusOptions code

(cherry picked from commit 881126c7f1145fb2db1143b63c1e0f2f81ebb2ea)
---
 frontend/src/pages/Deal.vue       | 12 +++++++++---
 frontend/src/pages/Lead.vue       | 12 +++++++++---
 frontend/src/pages/MobileDeal.vue | 12 +++++++++---
 frontend/src/pages/MobileLead.vue | 12 +++++++++---
 frontend/src/stores/statuses.js   | 16 ++--------------
 5 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index c21400f6..baaf0a53 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -26,9 +26,10 @@
         :options="
           statusOptions(
             'deal',
-            document,
-            deal.data._customStatuses,
-            triggerOnChange,
+            document.statuses?.length
+              ? document.statuses
+              : deal.data._customStatuses,
+            triggerStatusChange,
           )
         "
       >
@@ -755,6 +756,11 @@ const { assignees, document, triggerOnChange } = useDocument(
   props.dealId,
 )
 
+async function triggerStatusChange(value) {
+  await triggerOnChange('status', value)
+  document.save.submit()
+}
+
 function reloadAssignees(data) {
   if (data?.hasOwnProperty('deal_owner')) {
     assignees.reload()
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 1b830319..16b74414 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -26,9 +26,10 @@
         :options="
           statusOptions(
             'lead',
-            document,
-            lead.data._customStatuses,
-            triggerOnChange,
+            document.statuses?.length
+              ? document.statuses
+              : lead.data._customStatuses,
+            triggerStatusChange,
           )
         "
       >
@@ -320,6 +321,11 @@ const { triggerOnChange, assignees, document } = useDocument(
   props.leadId,
 )
 
+async function triggerStatusChange(value) {
+  await triggerOnChange('status', value)
+  document.save.submit()
+}
+
 const lead = createResource({
   url: 'crm.fcrm.doctype.crm_lead.api.get_lead',
   params: { name: props.leadId },
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index 1920266f..1039b387 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -14,9 +14,10 @@
           :options="
             statusOptions(
               'deal',
-              document,
-              deal.data._customStatuses,
-              triggerOnChange,
+              document.statuses?.length
+                ? document.statuses
+                : deal.data._customStatuses,
+              triggerStatusChange,
             )
           "
         >
@@ -624,6 +625,11 @@ const { assignees, document, triggerOnChange } = useDocument(
   props.dealId,
 )
 
+async function triggerStatusChange(value) {
+  await triggerOnChange('status', value)
+  document.save.submit()
+}
+
 function reloadAssignees(data) {
   if (data?.hasOwnProperty('deal_owner')) {
     assignees.reload()
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index 21743037..0a83e0ec 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -14,9 +14,10 @@
           :options="
             statusOptions(
               'lead',
-              document,
-              lead.data._customStatuses,
-              triggerOnChange,
+              document.statuses?.length
+                ? document.statuses
+                : lead.data._customStatuses,
+              triggerStatusChange,
             )
           "
         >
@@ -473,6 +474,11 @@ const { assignees, document, triggerOnChange } = useDocument(
   props.leadId,
 )
 
+async function triggerStatusChange(value) {
+  await triggerOnChange('status', value)
+  document.save.submit()
+}
+
 function reloadAssignees(data) {
   if (data?.hasOwnProperty('lead_owner')) {
     assignees.reload()
diff --git a/frontend/src/stores/statuses.js b/frontend/src/stores/statuses.js
index 0bcdbf3d..637c8d2f 100644
--- a/frontend/src/stores/statuses.js
+++ b/frontend/src/stores/statuses.js
@@ -77,19 +77,10 @@ export const statusesStore = defineStore('crm-statuses', () => {
     return communicationStatuses[name]
   }
 
-  function statusOptions(
-    doctype,
-    document,
-    statuses = [],
-    triggerOnChange = null,
-  ) {
+  function statusOptions(doctype, statuses = [], triggerStatusChange = null) {
     let statusesByName =
       doctype == 'deal' ? dealStatusesByName : leadStatusesByName
 
-    if (document?.statuses?.length) {
-      statuses = document.statuses
-    }
-
     if (statuses?.length) {
       statusesByName = statuses.reduce((acc, status) => {
         acc[status] = statusesByName[status]
@@ -104,11 +95,8 @@ export const statusesStore = defineStore('crm-statuses', () => {
         value: statusesByName[status]?.name,
         icon: () => h(IndicatorIcon, { class: statusesByName[status]?.color }),
         onClick: async () => {
+          await triggerStatusChange?.(statusesByName[status]?.name)
           capture('status_changed', { doctype, status })
-          if (document) {
-            await triggerOnChange?.('status', statusesByName[status]?.name)
-            document.save.submit()
-          }
         },
       })
     }

From a7bc3abcdd4dd3034b5855ebe8e9beff0f73014a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 14:11:11 +0530
Subject: [PATCH 18/26] fix: show lost reason modal if status changed to lost

(cherry picked from commit d89c304b134a7ec1f7a16bc667f2ee13858daac9)

# Conflicts:
#	frontend/components.d.ts
---
 frontend/components.d.ts                      |  4 +
 .../src/components/Modals/LostReasonModal.vue | 99 +++++++++++++++++++
 frontend/src/pages/Deal.vue                   | 23 ++++-
 frontend/src/pages/MobileDeal.vue             | 23 ++++-
 4 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 frontend/src/components/Modals/LostReasonModal.vue

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 984d8e3a..84f74933 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -162,7 +162,11 @@ declare module 'vue' {
     ListIcon: typeof import('./src/components/Icons/ListIcon.vue')['default']
     ListRows: typeof import('./src/components/ListViews/ListRows.vue')['default']
     LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default']
+<<<<<<< HEAD
     LucideCalendar: typeof import('~icons/lucide/calendar')['default']
+=======
+    LostReasonModal: typeof import('./src/components/Modals/LostReasonModal.vue')['default']
+>>>>>>> d89c304b (fix: show lost reason modal if status changed to lost)
     LucideInfo: typeof import('~icons/lucide/info')['default']
     LucideMoreHorizontal: typeof import('~icons/lucide/more-horizontal')['default']
     LucidePlus: typeof import('~icons/lucide/plus')['default']
diff --git a/frontend/src/components/Modals/LostReasonModal.vue b/frontend/src/components/Modals/LostReasonModal.vue
new file mode 100644
index 00000000..7553641d
--- /dev/null
+++ b/frontend/src/components/Modals/LostReasonModal.vue
@@ -0,0 +1,99 @@
+<template>
+  <Dialog
+    v-model="show"
+    :options="{ title: __('Lost reason') }"
+    @close="cancel"
+  >
+    <template #body-content>
+      <div class="-mt-3 mb-4 text-p-base text-ink-gray-7">
+        {{ __('Please provide a reason for marking this deal as lost') }}
+      </div>
+      <div class="flex flex-col gap-3">
+        <div>
+          <div class="mb-2 text-sm text-ink-gray-5">
+            {{ __('Lost reason') }}
+            <span class="text-ink-red-2">*</span>
+          </div>
+          <Link
+            class="form-control flex-1 truncate"
+            :value="lostReason"
+            doctype="CRM Lost Reason"
+            @change="(v) => (lostReason = v)"
+            :onCreate="onCreate"
+          />
+        </div>
+        <div>
+          <div class="mb-2 text-sm text-ink-gray-5">
+            {{ __('Lost notes') }}
+            <span v-if="lostReason == 'Other'" class="text-ink-red-2">*</span>
+          </div>
+          <FormControl
+            class="form-control flex-1 truncate"
+            type="textarea"
+            :value="lostNotes"
+            @change="(e) => (lostNotes = e.target.value)"
+          />
+        </div>
+      </div>
+    </template>
+    <template #actions>
+      <div class="flex justify-between items-center gap-2">
+        <div><ErrorMessage :message="error" /></div>
+        <div class="flex gap-2">
+          <Button :label="__('Cancel')" @click="cancel" />
+          <Button variant="solid" :label="__('Save')" @click="save" />
+        </div>
+      </div>
+    </template>
+  </Dialog>
+</template>
+<script setup>
+import Link from '@/components/Controls/Link.vue'
+import { Dialog } from 'frappe-ui'
+import { ref } from 'vue'
+
+const props = defineProps({
+  deal: {
+    type: Object,
+    required: true,
+  },
+})
+
+const show = defineModel()
+
+const lostReason = ref('')
+const lostNotes = ref('')
+const error = ref('')
+
+function cancel() {
+  show.value = false
+  error.value = ''
+  lostReason.value = ''
+  lostNotes.value = ''
+  props.deal.doc.status = props.deal.originalDoc.status
+}
+
+function save() {
+  if (!lostReason.value) {
+    error.value = __('Lost reason is required')
+    return
+  }
+  if (lostReason.value === 'Other' && !lostNotes.value) {
+    error.value = __('Lost notes are required when lost reason is "Other"')
+    return
+  }
+
+  error.value = ''
+  show.value = false
+
+  props.deal.doc.lost_reason = lostReason.value
+  props.deal.doc.lost_notes = lostNotes.value
+  props.deal.save.submit()
+}
+
+function onCreate() {
+  // This function can be used to handle the creation of a new lost reason
+  // For now, we just close the modal after creating a new reason
+  show.value = false
+}
+</script>
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index baaf0a53..3efb5b0e 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -327,6 +327,11 @@
     :docname="props.dealId"
     name="Deals"
   />
+  <LostReasonModal
+    v-if="showLostReasonModal"
+    v-model="showLostReasonModal"
+    :deal="document"
+  />
 </template>
 <script setup>
 import ErrorPage from '@/components/ErrorPage.vue'
@@ -350,6 +355,7 @@ import AttachmentIcon from '@/components/Icons/AttachmentIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import Activities from '@/components/Activities/Activities.vue'
 import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
+import LostReasonModal from '@/components/Modals/LostReasonModal.vue'
 import AssignTo from '@/components/AssignTo.vue'
 import FilesUploader from '@/components/FilesUploader/FilesUploader.vue'
 import ContactModal from '@/components/Modals/ContactModal.vue'
@@ -758,7 +764,22 @@ const { assignees, document, triggerOnChange } = useDocument(
 
 async function triggerStatusChange(value) {
   await triggerOnChange('status', value)
-  document.save.submit()
+  setLostReason()
+}
+
+const showLostReasonModal = ref(false)
+
+function setLostReason() {
+  if (
+    document.doc.status !== 'Lost' ||
+    (document.doc.lost_reason && document.doc.lost_reason !== 'Other') ||
+    (document.doc.lost_reason === 'Other' && document.doc.lost_notes)
+  ) {
+    document.save.submit()
+    return
+  }
+
+  showLostReasonModal.value = true
 }
 
 function reloadAssignees(data) {
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index 1039b387..c8355bd1 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -245,6 +245,11 @@
       afterInsert: (doc) => addContact(doc.name),
     }"
   />
+  <LostReasonModal
+    v-if="showLostReasonModal"
+    v-model="showLostReasonModal"
+    :deal="document"
+  />
 </template>
 <script setup>
 import Icon from '@/components/Icon.vue'
@@ -265,6 +270,7 @@ import SuccessIcon from '@/components/Icons/SuccessIcon.vue'
 import LayoutHeader from '@/components/LayoutHeader.vue'
 import Activities from '@/components/Activities/Activities.vue'
 import OrganizationModal from '@/components/Modals/OrganizationModal.vue'
+import LostReasonModal from '@/components/Modals/LostReasonModal.vue'
 import AssignTo from '@/components/AssignTo.vue'
 import ContactModal from '@/components/Modals/ContactModal.vue'
 import Section from '@/components/Section.vue'
@@ -627,7 +633,22 @@ const { assignees, document, triggerOnChange } = useDocument(
 
 async function triggerStatusChange(value) {
   await triggerOnChange('status', value)
-  document.save.submit()
+  setLostReason()
+}
+
+const showLostReasonModal = ref(false)
+
+function setLostReason() {
+  if (
+    document.doc.status !== 'Lost' ||
+    (document.doc.lost_reason && document.doc.lost_reason !== 'Other') ||
+    (document.doc.lost_reason === 'Other' && document.doc.lost_notes)
+  ) {
+    document.save.submit()
+    return
+  }
+
+  showLostReasonModal.value = true
 }
 
 function reloadAssignees(data) {

From e4abb0f9de1002c03afc978ec6a7055a8345320b Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 15:28:21 +0530
Subject: [PATCH 19/26] fix: intercept data tab's before save and side panel's
 before field change to show lost reason modal

(cherry picked from commit 391844512a1e5955c866f77c7fde01cc40129c19)
---
 .../src/components/Activities/Activities.vue  |  3 ++-
 .../src/components/Activities/DataFields.vue  | 19 +++++++++++----
 .../src/components/Modals/LostReasonModal.vue |  4 ++--
 frontend/src/components/SidePanelLayout.vue   | 23 +++++++++++--------
 frontend/src/pages/Deal.vue                   | 12 ++++++++++
 frontend/src/pages/MobileDeal.vue             | 13 +++++++++++
 6 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/Activities/Activities.vue b/frontend/src/components/Activities/Activities.vue
index 1c420e04..e13095aa 100644
--- a/frontend/src/components/Activities/Activities.vue
+++ b/frontend/src/components/Activities/Activities.vue
@@ -368,6 +368,7 @@
       <DataFields
         :doctype="doctype"
         :docname="doc.data.name"
+        @beforeSave="(data) => emit('beforeSave', data)"
         @afterSave="(data) => emit('afterSave', data)"
       />
     </div>
@@ -518,7 +519,7 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['afterSave'])
+const emit = defineEmits(['beforeSave', 'afterSave'])
 
 const route = useRoute()
 
diff --git a/frontend/src/components/Activities/DataFields.vue b/frontend/src/components/Activities/DataFields.vue
index 88119f80..5b864ef1 100644
--- a/frontend/src/components/Activities/DataFields.vue
+++ b/frontend/src/components/Activities/DataFields.vue
@@ -66,7 +66,7 @@ import LoadingIndicator from '@/components/Icons/LoadingIndicator.vue'
 import { usersStore } from '@/stores/users'
 import { useDocument } from '@/data/document'
 import { isMobileView } from '@/composables/settings'
-import { ref, watch } from 'vue'
+import { ref, watch, getCurrentInstance } from 'vue'
 
 const props = defineProps({
   doctype: {
@@ -79,10 +79,13 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['afterSave'])
+const emit = defineEmits(['beforeSave', 'afterSave'])
 
 const { isManager } = usersStore()
 
+const instance = getCurrentInstance()
+const attrs = instance?.vnode?.props ?? {}
+
 const showDataFieldsModal = ref(false)
 
 const { document } = useDocument(props.doctype, props.docname)
@@ -107,9 +110,15 @@ function saveChanges() {
     return acc
   }, {})
 
-  document.save.submit(null, {
-    onSuccess: () => emit('afterSave', changes),
-  })
+  const hasListener = attrs['onBeforeSave'] !== undefined
+
+  if (hasListener) {
+    emit('beforeSave', changes)
+  } else {
+    document.save.submit(null, {
+      onSuccess: () => emit('afterSave', changes),
+    })
+  }
 }
 
 watch(
diff --git a/frontend/src/components/Modals/LostReasonModal.vue b/frontend/src/components/Modals/LostReasonModal.vue
index 7553641d..54d531e0 100644
--- a/frontend/src/components/Modals/LostReasonModal.vue
+++ b/frontend/src/components/Modals/LostReasonModal.vue
@@ -61,8 +61,8 @@ const props = defineProps({
 
 const show = defineModel()
 
-const lostReason = ref('')
-const lostNotes = ref('')
+const lostReason = ref(props.deal.doc.lost_reason || '')
+const lostNotes = ref(props.deal.doc.lost_notes || '')
 const error = ref('')
 
 function cancel() {
diff --git a/frontend/src/components/SidePanelLayout.vue b/frontend/src/components/SidePanelLayout.vue
index c8dcaaab..1bfe6b3a 100644
--- a/frontend/src/components/SidePanelLayout.vue
+++ b/frontend/src/components/SidePanelLayout.vue
@@ -400,7 +400,7 @@ import { getFormat, evaluateDependsOnValue } from '@/utils'
 import { flt } from '@/utils/numberFormat.js'
 import { Tooltip, DateTimePicker, DatePicker } from 'frappe-ui'
 import { useDocument } from '@/data/document'
-import { ref, computed } from 'vue'
+import { ref, computed, getCurrentInstance } from 'vue'
 
 const props = defineProps({
   sections: {
@@ -424,7 +424,7 @@ const props = defineProps({
   },
 })
 
-const emit = defineEmits(['afterFieldChange', 'reload'])
+const emit = defineEmits(['beforeFieldChange', 'afterFieldChange', 'reload'])
 
 const { getFormattedPercent, getFormattedFloat, getFormattedCurrency } =
   getMeta(props.doctype)
@@ -496,18 +496,23 @@ function parsedField(field) {
   return _field
 }
 
+const instance = getCurrentInstance()
+const attrs = instance?.vnode?.props ?? {}
+
 async function fieldChange(value, df) {
   if (props.preview) return
 
   await triggerOnChange(df.fieldname, value)
 
-  document.save.submit(null, {
-    onSuccess: () => {
-      emit('afterFieldChange', {
-        [df.fieldname]: value,
-      })
-    },
-  })
+  const hasListener = attrs['onBeforeFieldChange'] !== undefined
+
+  if (hasListener) {
+    emit('beforeFieldChange', { [df.fieldname]: value })
+  } else {
+    document.save.submit(null, {
+      onSuccess: () => emit('afterFieldChange', { [df.fieldname]: value }),
+    })
+  }
 }
 
 function parsedSection(section, editButtonAdded) {
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 3efb5b0e..df0608c2 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -61,6 +61,7 @@
           v-model:reload="reload"
           v-model:tabIndex="tabIndex"
           v-model="deal"
+          @beforeSave="beforeStatusChange"
           @afterSave="reloadAssignees"
         />
       </template>
@@ -148,6 +149,7 @@
           doctype="CRM Deal"
           :docname="deal.data.name"
           @reload="sections.reload"
+          @beforeFieldChange="beforeStatusChange"
           @afterFieldChange="reloadAssignees"
         >
           <template #actions="{ section }">
@@ -782,6 +784,16 @@ function setLostReason() {
   showLostReasonModal.value = true
 }
 
+function beforeStatusChange(data) {
+  if (data?.hasOwnProperty('status') && data.status == 'Lost') {
+    setLostReason()
+  } else {
+    document.save.submit(null, {
+      onSuccess: () => reloadAssignees(data),
+    })
+  }
+}
+
 function reloadAssignees(data) {
   if (data?.hasOwnProperty('deal_owner')) {
     assignees.reload()
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index c8355bd1..9a93f304 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -79,6 +79,7 @@
               doctype="CRM Deal"
               :docname="deal.data.name"
               @reload="sections.reload"
+              @beforeFieldChange="beforeStatusChange"
               @afterFieldChange="reloadAssignees"
             >
               <template #actions="{ section }">
@@ -223,6 +224,8 @@
           v-model:reload="reload"
           v-model:tabIndex="tabIndex"
           v-model="deal"
+          @beforeSave="beforeStatusChange"
+          @afterSave="reloadAssignees"
         />
       </TabPanel>
     </Tabs>
@@ -651,6 +654,16 @@ function setLostReason() {
   showLostReasonModal.value = true
 }
 
+function beforeStatusChange(data) {
+  if (data?.hasOwnProperty('status') && data.status == 'Lost') {
+    setLostReason()
+  } else {
+    document.save.submit(null, {
+      onSuccess: () => reloadAssignees(data),
+    })
+  }
+}
+
 function reloadAssignees(data) {
   if (data?.hasOwnProperty('deal_owner')) {
     assignees.reload()

From 5f459f58cb0f85a928fd0a73d3c57a7ebf8c2ea1 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 15:42:25 +0530
Subject: [PATCH 20/26] fix: allow creating lost reason from lost reason modal
 field

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

diff --git a/frontend/src/components/Modals/LostReasonModal.vue b/frontend/src/components/Modals/LostReasonModal.vue
index 54d531e0..501733be 100644
--- a/frontend/src/components/Modals/LostReasonModal.vue
+++ b/frontend/src/components/Modals/LostReasonModal.vue
@@ -49,6 +49,7 @@
 </template>
 <script setup>
 import Link from '@/components/Controls/Link.vue'
+import { createDocument } from '@/composables/document'
 import { Dialog } from 'frappe-ui'
 import { ref } from 'vue'
 
@@ -91,9 +92,7 @@ function save() {
   props.deal.save.submit()
 }
 
-function onCreate() {
-  // This function can be used to handle the creation of a new lost reason
-  // For now, we just close the modal after creating a new reason
-  show.value = false
+function onCreate(value, close) {
+  createDocument('CRM Lost Reason', value, close)
 }
 </script>

From d0d67bf2ad72458454e9cc93891ec292381761ec Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 15:58:12 +0530
Subject: [PATCH 21/26] fix: update default probability from deal status

(cherry picked from commit c96e5ff6c58ca991aca8f705114317e96beb5d42)
---
 crm/fcrm/doctype/crm_deal/crm_deal.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/crm/fcrm/doctype/crm_deal/crm_deal.py b/crm/fcrm/doctype/crm_deal/crm_deal.py
index 3022e6a7..6e056ffe 100644
--- a/crm/fcrm/doctype/crm_deal/crm_deal.py
+++ b/crm/fcrm/doctype/crm_deal/crm_deal.py
@@ -142,8 +142,16 @@ class CRMDeal(Document):
 		if self.status == "Won" and not self.close_date:
 			self.close_date = frappe.utils.nowdate()
 
+	def update_default_probability(self):
+		"""
+		Update the default probability based on the status.
+		"""
+		if not self.probability or self.probability == 0:
+			self.probability = frappe.db.get_value("CRM Deal Status", self.status, "probability") or 0
+
 	def validate_forcasting_fields(self):
 		self.update_close_date()
+		self.update_default_probability()
 		if frappe.db.get_single_value("FCRM Settings", "enable_forecasting"):
 			if not self.deal_value or self.deal_value == 0:
 				frappe.throw(_("Deal Value is required."), frappe.MandatoryError)

From b50c2e6d00dce2fc198ec7bc67a48ff806af307b Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Wed, 2 Jul 2025 16:35:51 +0530
Subject: [PATCH 22/26] chore: resolved conflict

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

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 84f74933..63df320c 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -162,11 +162,7 @@ declare module 'vue' {
     ListIcon: typeof import('./src/components/Icons/ListIcon.vue')['default']
     ListRows: typeof import('./src/components/ListViews/ListRows.vue')['default']
     LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default']
-<<<<<<< HEAD
-    LucideCalendar: typeof import('~icons/lucide/calendar')['default']
-=======
     LostReasonModal: typeof import('./src/components/Modals/LostReasonModal.vue')['default']
->>>>>>> d89c304b (fix: show lost reason modal if status changed to lost)
     LucideInfo: typeof import('~icons/lucide/info')['default']
     LucideMoreHorizontal: typeof import('~icons/lucide/more-horizontal')['default']
     LucidePlus: typeof import('~icons/lucide/plus')['default']

From 4d162cd0dd4a5fb2e0dde4e33589c80985642b1d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 16:57:26 +0530
Subject: [PATCH 23/26] fix: add default lost reason on install

(cherry picked from commit 96cbdea8201301fd5b5c117742c7ecab83fff902)
---
 crm/install.py | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/crm/install.py b/crm/install.py
index 9f8e617d..c42fc0fa 100644
--- a/crm/install.py
+++ b/crm/install.py
@@ -20,6 +20,7 @@ def after_install(force=False):
 	add_email_template_custom_fields()
 	add_default_industries()
 	add_default_lead_sources()
+	add_default_lost_reasons()
 	add_standard_dropdown_items()
 	add_default_scripts()
 	frappe.db.commit()
@@ -351,6 +352,44 @@ def add_default_lead_sources():
 		doc.insert()
 
 
+def add_default_lost_reasons():
+	lost_reasons = [
+		{
+			"reason": "Pricing",
+			"description": "The prospect found the pricing to be too high or not competitive.",
+		},
+		{"reason": "Competition", "description": "The prospect chose a competitor's product or service."},
+		{
+			"reason": "Budget Constraints",
+			"description": "The prospect did not have the budget to proceed with the purchase.",
+		},
+		{
+			"reason": "Missing Features",
+			"description": "The prospect felt that the product or service was missing key features they needed.",
+		},
+		{
+			"reason": "Long Sales Cycle",
+			"description": "The sales process took too long, leading to loss of interest.",
+		},
+		{
+			"reason": "No Decision-Maker",
+			"description": "The prospect was not the decision-maker and could not proceed.",
+		},
+		{"reason": "Unresponsive Prospect", "description": "The prospect did not respond to follow-ups."},
+		{"reason": "Poor Fit", "description": "The prospect was not a good fit for the product or service."},
+		{"reason": "Other", "description": ""},
+	]
+
+	for reason in lost_reasons:
+		if frappe.db.exists("CRM Lost Reason", reason):
+			continue
+
+		doc = frappe.new_doc("CRM Lost Reason")
+		doc.lost_reason = reason["reason"]
+		doc.description = reason["description"]
+		doc.insert()
+
+
 def add_standard_dropdown_items():
 	crm_settings = frappe.get_single("FCRM Settings")
 

From 39d97e1e0b4ab957ca85a459a0024727e713a8b8 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 17:03:28 +0530
Subject: [PATCH 24/26] build(deps): bump frappeui to 0.1.166

(cherry picked from commit fc89c7b93caee3dbcde1db826a114f2f20d58313)
---
 frontend/package.json |  2 +-
 yarn.lock             | 37 +++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 1f359a5c..7672e8df 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -13,7 +13,7 @@
     "@tiptap/extension-paragraph": "^2.12.0",
     "@twilio/voice-sdk": "^2.10.2",
     "@vueuse/integrations": "^10.3.0",
-    "frappe-ui": "^0.1.162",
+    "frappe-ui": "^0.1.166",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",
diff --git a/yarn.lock b/yarn.lock
index ed8ede6e..8bf356a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1562,7 +1562,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/trusted-types@^2.0.2":
+"@types/trusted-types@^2.0.2", "@types/trusted-types@^2.0.7":
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11"
   integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==
@@ -2094,11 +2094,6 @@ commander@^4.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
   integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
 
-commander@^9.0.0:
-  version "9.5.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
-  integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
-
 common-tags@^1.8.0:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
@@ -2273,6 +2268,13 @@ dlv@^1.1.3:
   resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
   integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
 
+dompurify@^3.2.6:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.6.tgz#ca040a6ad2b88e2a92dc45f38c79f84a714a1cad"
+  integrity sha512-/2GogDQlohXPZe6D6NOgQvXLPSYBqIWMnZ8zzOhn09REE4eyAzb+Hed3jhoM9OkuaJ8P6ZGTTVWQKAi8ieIzfQ==
+  optionalDependencies:
+    "@types/trusted-types" "^2.0.7"
+
 dunder-proto@^1.0.0, dunder-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
@@ -2570,10 +2572,10 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-frappe-ui@^0.1.162:
-  version "0.1.162"
-  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.162.tgz#01a2f06e9db70b1bce6e0b0f2089a9cc1cb8dd51"
-  integrity sha512-LdlEQ1I8oMj2TAmx0FGuJl+AwQ6/jqtwEy3lei3mH6SVArfGnoVDqLm8aeJTwAB6KUjgCj+ffWe6vN7HmZXIcg==
+frappe-ui@^0.1.166:
+  version "0.1.166"
+  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.166.tgz#2664d9373b4751a39144c283be67f219c5eb99e3"
+  integrity sha512-VSv2OE/JHa4ReOW0/9SafRzvQ6Dkxa1Bz6u58UU8FvagqpJVorQJlm2854LXuCk1IDV+uulPCr7uxiC8kwcjFw==
   dependencies:
     "@floating-ui/vue" "^1.1.6"
     "@headlessui/vue" "^1.7.14"
@@ -2603,12 +2605,14 @@ frappe-ui@^0.1.162:
     "@tiptap/vue-3" "^2.0.3"
     "@vueuse/core" "^10.4.1"
     dayjs "^1.11.13"
+    dompurify "^3.2.6"
     echarts "^5.6.0"
     feather-icons "^4.28.0"
     highlight.js "^11.11.1"
     idb-keyval "^6.2.0"
     lowlight "^3.3.0"
     lucide-static "^0.479.0"
+    marked "^15.0.12"
     ora "5.4.1"
     prettier "^3.3.2"
     prosemirror-model "^1.25.1"
@@ -2616,7 +2620,6 @@ frappe-ui@^0.1.162:
     prosemirror-view "^1.39.2"
     radix-vue "^1.5.3"
     reka-ui "^2.0.2"
-    showdown "^2.1.0"
     socket.io-client "^4.5.1"
     tippy.js "^6.3.7"
     typescript "^5.0.2"
@@ -3305,6 +3308,11 @@ markdown-it@^14.0.0:
     punycode.js "^2.3.1"
     uc.micro "^2.1.0"
 
+marked@^15.0.12:
+  version "15.0.12"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-15.0.12.tgz#30722c7346e12d0a2d0207ab9b0c4f0102d86c4e"
+  integrity sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==
+
 math-intrinsics@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
@@ -4146,13 +4154,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-showdown@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/showdown/-/showdown-2.1.0.tgz#1251f5ed8f773f0c0c7bfc8e6fd23581f9e545c5"
-  integrity sha512-/6NVYu4U819R2pUIk79n67SYgJHWCce0a5xTP979WbNp0FL9MN1I1QK662IDU1b6JzKTvmhgI7T7JYIxBi3kMQ==
-  dependencies:
-    commander "^9.0.0"
-
 side-channel-list@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"

From 48006552ee5aa6383574db018860d3aa386830b4 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 17:15:59 +0530
Subject: [PATCH 25/26] fix: check reason.reason not reason

(cherry picked from commit cab80edf60c0453823e352577ebfa6b3b04cfe2f)
---
 crm/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/install.py b/crm/install.py
index c42fc0fa..ae0a437c 100644
--- a/crm/install.py
+++ b/crm/install.py
@@ -381,7 +381,7 @@ def add_default_lost_reasons():
 	]
 
 	for reason in lost_reasons:
-		if frappe.db.exists("CRM Lost Reason", reason):
+		if frappe.db.exists("CRM Lost Reason", reason["reason"]):
 			continue
 
 		doc = frappe.new_doc("CRM Lost Reason")

From 8c91f38fee88200363c82f7750c896063975ca6d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Wed, 2 Jul 2025 17:45:46 +0530
Subject: [PATCH 26/26] fix: grid field is not getting set

(cherry picked from commit 39eb5600d93ce27e4468db135db4c59ead410a74)
---
 frontend/src/data/document.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/frontend/src/data/document.js b/frontend/src/data/document.js
index d5893552..4d073e3e 100644
--- a/frontend/src/data/document.js
+++ b/frontend/src/data/document.js
@@ -136,8 +136,14 @@ export function useDocument(doctype, docname) {
   }
 
   async function triggerOnChange(fieldname, value, row) {
-    const oldValue = documentsCache[doctype][docname || ''].doc[fieldname]
-    documentsCache[doctype][docname || ''].doc[fieldname] = value
+    let oldValue = null
+    if (row) {
+      oldValue = row[fieldname]
+      row[fieldname] = value
+    } else {
+      oldValue = documentsCache[doctype][docname || ''].doc[fieldname]
+      documentsCache[doctype][docname || ''].doc[fieldname] = value
+    }
 
     const handler = async function () {
       this.value = value
@@ -151,7 +157,11 @@ export function useDocument(doctype, docname) {
     try {
       await trigger(handler, row)
     } catch (error) {
-      documentsCache[doctype][docname || ''].doc[fieldname] = oldValue
+      if (row) {
+        row[fieldname] = oldValue
+      } else {
+        documentsCache[doctype][docname || ''].doc[fieldname] = oldValue
+      }
       console.error(handler)
       throw error
     }