From 93176a8d0c249ed3960984449b8f54adce3ef15a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 5 Jun 2025 15:31:36 +0530
Subject: [PATCH 1/5] fix: activity is not loading

(cherry picked from commit a25ff14dd4d23864bbf6b76ebac5dbbd0e906abf)
---
 frontend/src/components/Activities/Activities.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Activities/Activities.vue b/frontend/src/components/Activities/Activities.vue
index 8a8004d2..3842a6dc 100644
--- a/frontend/src/components/Activities/Activities.vue
+++ b/frontend/src/components/Activities/Activities.vue
@@ -320,7 +320,7 @@
                   {{ startCase(__(activity.type)) }}
                 </span>
                 <span
-                  v-if="activity.data.old_value"
+                  v-if="activity.data?.old_value"
                   class="max-w-xs font-medium text-ink-gray-8"
                 >
                   <div
@@ -336,7 +336,7 @@
                 </span>
                 <span v-if="activity.to">{{ __('to') }}</span>
                 <span
-                  v-if="activity.data.value"
+                  v-if="activity.data?.value"
                   class="max-w-xs font-medium text-ink-gray-8"
                 >
                   <div

From e623e0628f8f5eda13c0dd757ee960ef0fd387b5 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 5 Jun 2025 16:07:40 +0530
Subject: [PATCH 2/5] refactor: call log modal code refactor

(cherry picked from commit 28ea88f61e731aeeac64cd4272a61b7149d6a3d5)
---
 .../src/components/Activities/AllModals.vue   |  3 +-
 .../src/components/Activities/CallArea.vue    |  6 ++-
 .../src/components/Modals/CallLogModal.vue    | 39 ++++++++-----------
 frontend/src/pages/CallLogs.vue               |  3 +-
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/Activities/AllModals.vue b/frontend/src/components/Activities/AllModals.vue
index 4a51734b..e4f7498b 100644
--- a/frontend/src/components/Activities/AllModals.vue
+++ b/frontend/src/components/Activities/AllModals.vue
@@ -16,8 +16,9 @@
     @after="redirect('notes')"
   />
   <CallLogModal
+    v-if="showCallLogModal"
     v-model="showCallLogModal"
-    v-model:callLog="callLog"
+    :data="callLog"
     :options="{ afterInsert: () => activities.reload() }"
   />
 </template>
diff --git a/frontend/src/components/Activities/CallArea.vue b/frontend/src/components/Activities/CallArea.vue
index 6cdceeba..d7771879 100644
--- a/frontend/src/components/Activities/CallArea.vue
+++ b/frontend/src/components/Activities/CallArea.vue
@@ -97,7 +97,11 @@
       v-model:callLogModal="showCallLogModal"
       v-model:callLog="callLog"
     />
-    <CallLogModal v-model="showCallLogModal" v-model:callLog="callLog.data" />
+    <CallLogModal
+      v-if="showCallLogModal"
+      v-model="showCallLogModal"
+      :data="callLog.data"
+    />
   </div>
 </template>
 <script setup>
diff --git a/frontend/src/components/Modals/CallLogModal.vue b/frontend/src/components/Modals/CallLogModal.vue
index 3db8e2bd..c8aeb374 100644
--- a/frontend/src/components/Modals/CallLogModal.vue
+++ b/frontend/src/components/Modals/CallLogModal.vue
@@ -44,9 +44,13 @@ import { getRandom } from '@/utils'
 import { capture } from '@/telemetry'
 import { useDocument } from '@/data/document'
 import { FeatherIcon, createResource, ErrorMessage, Badge } from 'frappe-ui'
-import { ref, nextTick, watch, computed } from 'vue'
+import { ref, nextTick, computed, onMounted } from 'vue'
 
 const props = defineProps({
+  data: {
+    type: Object,
+    default: () => ({}),
+  },
   options: {
     type: Object,
     default: {
@@ -58,14 +62,15 @@ const props = defineProps({
 const { isManager } = usersStore()
 
 const show = defineModel()
-const _callLog = defineModel('callLog')
 
 const loading = ref(false)
 const error = ref(null)
-const title = ref(null)
 const editMode = ref(false)
 
-const callLog = ref(null)
+const { document: callLog } = useDocument(
+  'CRM Call Log',
+  props.data?.name || '',
+)
 
 const dialogOptions = computed(() => {
   let title = !editMode.value ? __('New Call Log') : __('Edit Call Log')
@@ -109,7 +114,7 @@ const callBacks = {
 
 async function updateCallLog() {
   loading.value = true
-  await callLog.value.save.submit(null, callBacks)
+  await callLog.save.submit(null, callBacks)
 }
 
 const createCallLog = createResource({
@@ -120,7 +125,7 @@ const createCallLog = createResource({
         doctype: 'CRM Call Log',
         id: getRandom(6),
         telephony_medium: 'Manual',
-        ...callLog.value.doc,
+        ...callLog.doc,
       },
     }
   },
@@ -141,23 +146,13 @@ function handleCallLogUpdate(doc) {
   props.options.afterInsert && props.options.afterInsert(doc)
 }
 
-watch(
-  () => show.value,
-  (value) => {
-    if (!value) return
-    editMode.value = false
+onMounted(() => {
+  editMode.value = props.data?.name ? true : false
 
-    let docname = _callLog.value?.name
-    const { document } = useDocument('CRM Call Log', docname)
-    callLog.value = document
-
-    if (docname) {
-      editMode.value = true
-    } else {
-      callLog.value.doc = { ..._callLog.value }
-    }
-  },
-)
+  if (!props.data?.name) {
+    callLog.doc = { ...props.data }
+  }
+})
 
 function openQuickEntryModal() {
   showQuickEntryModal.value = true
diff --git a/frontend/src/pages/CallLogs.vue b/frontend/src/pages/CallLogs.vue
index be5e08a2..a0e2da95 100644
--- a/frontend/src/pages/CallLogs.vue
+++ b/frontend/src/pages/CallLogs.vue
@@ -62,8 +62,9 @@
     v-model:callLog="callLog"
   />
   <CallLogModal
+    v-if="showCallLogModal"
     v-model="showCallLogModal"
-    v-model:callLog="callLog.data"
+    :data="callLog.data"
     :options="{ afterInsert: () => callLogs.reload() }"
   />
 </template>

From 985c538044c60779fac402204f35c9461b55345f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 5 Jun 2025 16:08:13 +0530
Subject: [PATCH 3/5] refactor: organization modal code refactor

(cherry picked from commit 93629972464163a41063317c4337b77b24aaf166)

# Conflicts:
#	frontend/src/components/Modals/OrganizationModal.vue
---
 .../components/Modals/OrganizationModal.vue   | 39 ++++++++++---------
 frontend/src/pages/Deal.vue                   |  3 +-
 frontend/src/pages/MobileDeal.vue             |  3 +-
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/frontend/src/components/Modals/OrganizationModal.vue b/frontend/src/components/Modals/OrganizationModal.vue
index 553063d6..0e955e67 100644
--- a/frontend/src/components/Modals/OrganizationModal.vue
+++ b/frontend/src/components/Modals/OrganizationModal.vue
@@ -17,7 +17,16 @@
             </Button>
           </div>
         </div>
+<<<<<<< HEAD
         <FieldLayout v-if="tabs.data?.length" :tabs="tabs.data" :data="_organization" doctype="CRM Organization" />
+=======
+        <FieldLayout
+          v-if="tabs.data?.length"
+          :tabs="tabs.data"
+          :data="organization.doc"
+          doctype="CRM Organization"
+        />
+>>>>>>> 9362997 (refactor: organization modal code refactor)
         <ErrorMessage class="mt-8" v-if="error" :message="__(error)" />
       </div>
       <div class="px-4 pt-4 pb-7 sm:px-6">
@@ -47,6 +56,10 @@ import { ref, nextTick, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
 
 const props = defineProps({
+  data: {
+    type: Object,
+    default: () => ({}),
+  },
   options: {
     type: Object,
     default: {
@@ -60,27 +73,19 @@ const { isManager } = usersStore()
 
 const router = useRouter()
 const show = defineModel()
-const organization = defineModel('organization')
 
 const loading = ref(false)
-const title = ref(null)
-
-const { document: _organization } = useDocument('CRM Organization')
-
-if (Object.keys(_organization.doc).length != 0) {
-  _organization.doc = { no_of_employees: '1-10' }
-}
-
-let doc = ref({})
 const error = ref(null)
 
+const { document: organization } = useDocument('CRM Organization')
+
 async function createOrganization() {
   const doc = await call(
     'frappe.client.insert',
     {
       doc: {
         doctype: 'CRM Organization',
-        ..._organization.doc,
+        ...organization.doc,
       },
     },
     {
@@ -104,8 +109,6 @@ function handleOrganizationUpdate(doc) {
       name: 'Organization',
       params: { organizationId: doc.name },
     })
-  } else {
-    organization.value?.reload?.()
   }
   show.value = false
   props.options.afterInsert && props.options.afterInsert(doc)
@@ -123,13 +126,13 @@ const tabs = createResource({
           column.fields.forEach((field) => {
             if (field.fieldname == 'address') {
               field.create = (value, close) => {
-                _organization.doc.address = value
+                organization.doc.address = value
                 openAddressModal()
                 close()
               }
               field.edit = (address) => openAddressModal(address)
             } else if (field.fieldtype === 'Table') {
-              _organization.doc[field.fieldname] = []
+              organization.doc[field.fieldname] = []
             }
           })
         })
@@ -139,10 +142,8 @@ const tabs = createResource({
 })
 
 onMounted(() => {
-  Object.assign(
-    _organization.doc,
-    organization.value?.doc || organization.value || {},
-  )
+  organization.doc = { no_of_employees: '1-10' }
+  Object.assign(organization.doc, props.data)
 })
 
 function openQuickEntryModal() {
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 454565c0..9d438146 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -272,8 +272,9 @@
     :errorMessage="errorMessage"
   />
   <OrganizationModal
+    v-if="showOrganizationModal"
     v-model="showOrganizationModal"
-    v-model:organization="_organization"
+    :data="_organization"
     :options="{
       redirect: false,
       afterInsert: (doc) => updateField('organization', doc.name),
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index 1697ad5b..44dd6207 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -214,8 +214,9 @@
     </Tabs>
   </div>
   <OrganizationModal
+    v-if="showOrganizationModal"
     v-model="showOrganizationModal"
-    v-model:organization="_organization"
+    :data="_organization"
     :options="{
       redirect: false,
       afterInsert: (doc) => updateField('organization', doc.name),

From f1032b5f935a9e96fdf16a70f5fc4f669731d596 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 5 Jun 2025 16:08:51 +0530
Subject: [PATCH 4/5] refactor: set default values for new lead, deal and
 contact

(cherry picked from commit 71f764c224ebf43425da0adb2db4100e0a74aa6a)
---
 frontend/src/components/Modals/ContactModal.vue | 7 ++-----
 frontend/src/components/Modals/DealModal.vue    | 6 ++----
 frontend/src/components/Modals/LeadModal.vue    | 6 ++----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/Modals/ContactModal.vue b/frontend/src/components/Modals/ContactModal.vue
index 55e01f41..b275d574 100644
--- a/frontend/src/components/Modals/ContactModal.vue
+++ b/frontend/src/components/Modals/ContactModal.vue
@@ -84,10 +84,6 @@ const loading = ref(false)
 
 const { document: _contact } = useDocument('Contact')
 
-if (Object.keys(_contact.doc).length != 0) {
-  _contact.doc = {}
-}
-
 async function createContact() {
   if (_contact.doc.email_id) {
     _contact.doc.email_ids = [{ email_id: _contact.doc.email_id }]
@@ -155,7 +151,8 @@ const tabs = createResource({
 })
 
 onMounted(() => {
-  Object.assign(_contact.doc, props.contact.data || props.contact || {})
+  _contact.doc = {}
+  Object.assign(_contact.doc, props.contact.data || props.contact)
 })
 
 function openQuickEntryModal() {
diff --git a/frontend/src/components/Modals/DealModal.vue b/frontend/src/components/Modals/DealModal.vue
index e84e1a8e..1c516407 100644
--- a/frontend/src/components/Modals/DealModal.vue
+++ b/frontend/src/components/Modals/DealModal.vue
@@ -96,10 +96,6 @@ const error = ref(null)
 
 const { document: deal } = useDocument('CRM Deal')
 
-if (Object.keys(deal.doc).length != 0) {
-  deal.doc = {}
-}
-
 const hasOrganizationSections = ref(true)
 const hasContactSections = ref(true)
 
@@ -241,7 +237,9 @@ function openQuickEntryModal() {
 }
 
 onMounted(() => {
+  deal.doc = { no_of_employees: '1-10' }
   Object.assign(deal.doc, props.defaults)
+
   if (!deal.doc.deal_owner) {
     deal.doc.deal_owner = getUser().name
   }
diff --git a/frontend/src/components/Modals/LeadModal.vue b/frontend/src/components/Modals/LeadModal.vue
index bbc1adb5..bf1461d1 100644
--- a/frontend/src/components/Modals/LeadModal.vue
+++ b/frontend/src/components/Modals/LeadModal.vue
@@ -72,10 +72,6 @@ const isLeadCreating = ref(false)
 
 const { document: lead } = useDocument('CRM Lead')
 
-if (Object.keys(lead.doc).length != 0) {
-  lead.doc = {}
-}
-
 const leadStatuses = computed(() => {
   let statuses = statusOptions('lead')
   if (!lead.doc.status) {
@@ -186,7 +182,9 @@ function openQuickEntryModal() {
 }
 
 onMounted(() => {
+  lead.doc = { no_of_employees: '1-10' }
   Object.assign(lead.doc, props.defaults)
+
   if (!lead.doc?.lead_owner) {
     lead.doc.lead_owner = getUser().name
   }

From e93cc463be9c71a584d8d3324a06c0c2ecc9bb4d Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:18:48 +0530
Subject: [PATCH 5/5] chore: resolved conflict

---
 frontend/src/components/Modals/OrganizationModal.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/frontend/src/components/Modals/OrganizationModal.vue b/frontend/src/components/Modals/OrganizationModal.vue
index 0e955e67..a86567d6 100644
--- a/frontend/src/components/Modals/OrganizationModal.vue
+++ b/frontend/src/components/Modals/OrganizationModal.vue
@@ -17,16 +17,12 @@
             </Button>
           </div>
         </div>
-<<<<<<< HEAD
-        <FieldLayout v-if="tabs.data?.length" :tabs="tabs.data" :data="_organization" doctype="CRM Organization" />
-=======
         <FieldLayout
           v-if="tabs.data?.length"
           :tabs="tabs.data"
           :data="organization.doc"
           doctype="CRM Organization"
         />
->>>>>>> 9362997 (refactor: organization modal code refactor)
         <ErrorMessage class="mt-8" v-if="error" :message="__(error)" />
       </div>
       <div class="px-4 pt-4 pb-7 sm:px-6">