From 474fe5a954d70b1fc49b5b6422ef1e7335efdd3f Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Sun, 13 Apr 2025 15:05:26 +0000
Subject: [PATCH 01/46] chore(release): Bumped to Version 1.40.1

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 3a6c34a4..56172f18 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.40.0"
+__version__ = "1.40.1"
 __title__ = "Frappe CRM"
 

From 8b7089e5210d39797e1cbed770df73a58fbcbe52 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 14 Apr 2025 11:07:09 +0530
Subject: [PATCH 02/46] fix: restrict app in apps page if no access to FCRM
 module

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

diff --git a/crm/api/__init__.py b/crm/api/__init__.py
index 11cc039e..fe6f1fb5 100644
--- a/crm/api/__init__.py
+++ b/crm/api/__init__.py
@@ -1,5 +1,6 @@
 import frappe
 from bs4 import BeautifulSoup
+from frappe.config import get_modules_from_all_apps_for_user
 from frappe.core.api.file import get_max_file_size
 from frappe.translate import get_all_translations
 from frappe.utils import cstr, split_emails, validate_email_address
@@ -63,10 +64,10 @@ def check_app_permission():
 	if frappe.session.user == "Administrator":
 		return True
 
-	# allowed_modules = frappe.utils.modules.get_modules_from_all_apps_for_user()
-	# allowed_modules = [x["module_name"] for x in allowed_modules]
-	# if "FCRM" not in allowed_modules:
-	# 	return False
+	allowed_modules = get_modules_from_all_apps_for_user()
+	allowed_modules = [x["module_name"] for x in allowed_modules]
+	if "FCRM" not in allowed_modules:
+		return False
 
 	roles = frappe.get_roles()
 	if any(

From de60b9d96f576a9abe5e185fcce6e6f940d24366 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Mon, 14 Apr 2025 05:38:09 +0000
Subject: [PATCH 03/46] chore(release): Bumped to Version 1.40.2

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 56172f18..6b8b92ce 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.40.1"
+__version__ = "1.40.2"
 __title__ = "Frappe CRM"
 

From d2cda20d4e9ca03dcaf7835776917e412549ce41 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Tue, 22 Apr 2025 10:43:53 +0000
Subject: [PATCH 04/46] chore(release): Bumped to Version 1.41.0

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 6b8b92ce..00b46c01 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.40.2"
+__version__ = "1.41.0"
 __title__ = "Frappe CRM"
 

From 93d9abf6abe0fa3886b8a702269c5eba2e460bc8 Mon Sep 17 00:00:00 2001
From: Pratik <badhepd@gmail.com>
Date: Wed, 23 Apr 2025 15:54:54 +0530
Subject: [PATCH 05/46] fix: international call log issue

(cherry picked from commit 4907db44eb1b9cc51b700647fae6b1cdd5b38ce0)
---
 crm/integrations/api.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crm/integrations/api.py b/crm/integrations/api.py
index d8300678..6c4e35e0 100644
--- a/crm/integrations/api.py
+++ b/crm/integrations/api.py
@@ -110,12 +110,12 @@ def get_contact_by_phone_number(phone_number):
 	number = parse_phone_number(phone_number)
 
 	if number.get("is_valid"):
-		return get_contact(number.get("national_number"))
+		return get_contact(number.get("national_number"), number.get("country"))
 	else:
-		return get_contact(phone_number, exact_match=True)
+		return get_contact(phone_number, number.get("country"), exact_match=True)
 
 
-def get_contact(phone_number, exact_match=False):
+def get_contact(phone_number, country="IN", exact_match=False):
 	if not phone_number:
 		return {"mobile_no": phone_number}
 
@@ -149,11 +149,11 @@ def get_contact(phone_number, exact_match=False):
 				deal = frappe.db.get_value(
 					"CRM Contacts", {"contact": contact.name, "is_primary": 1}, "parent"
 				)
-				if are_same_phone_number(contact.mobile_no, phone_number, validate=not exact_match):
+				if are_same_phone_number(contact.mobile_no, phone_number, country, validate=not exact_match):
 					contact["deal"] = deal
 					return contact
 		# Else, return the first contact
-		if are_same_phone_number(contacts[0].mobile_no, phone_number, validate=not exact_match):
+		if are_same_phone_number(contacts[0].mobile_no, phone_number, country, validate=not exact_match):
 			return contacts[0]
 
 	# Else, Check if the number is associated with a lead
@@ -173,7 +173,7 @@ def get_contact(phone_number, exact_match=False):
 
 	if len(leads):
 		for lead in leads:
-			if are_same_phone_number(lead.mobile_no, phone_number, validate=not exact_match):
+			if are_same_phone_number(lead.mobile_no, phone_number, country, validate=not exact_match):
 				lead["lead"] = lead.name
 				lead["full_name"] = lead.lead_name
 				return lead

From c35a481152d14dd3b1b76cd78941edbb722d8014 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Wed, 23 Apr 2025 10:56:36 +0000
Subject: [PATCH 06/46] chore(release): Bumped to Version 1.41.1

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 00b46c01..405af477 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.41.0"
+__version__ = "1.41.1"
 __title__ = "Frappe CRM"
 

From 013119961a56964a55805ca40186b5b092147bfd Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Wed, 14 May 2025 18:37:35 +0000
Subject: [PATCH 07/46] chore(release): Bumped to Version 1.42.0

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 405af477..a06d720b 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.41.1"
+__version__ = "1.42.0"
 __title__ = "Frappe CRM"
 

From ed1c54a7a59e77acecc4f2adfb1ddf55c2a03824 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 15 May 2025 01:01:48 +0530
Subject: [PATCH 08/46] fix: contact/organization page not loading

(cherry picked from commit 8c94049e3cce7aadf83ad7e823d185ebd86af3f3)
(cherry picked from commit 4e84fd0731b15e1e16ec7da211da722aa1e5c401)
---
 frontend/src/pages/Contact.vue            | 2 +-
 frontend/src/pages/MobileContact.vue      | 2 +-
 frontend/src/pages/MobileDeal.vue         | 2 +-
 frontend/src/pages/MobileLead.vue         | 2 +-
 frontend/src/pages/MobileOrganization.vue | 2 +-
 frontend/src/pages/Organization.vue       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index 18fccd2d..e9fb75bb 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -121,9 +121,9 @@
         class="flex flex-1 flex-col justify-between overflow-hidden"
       >
         <SidePanelLayout
-          v-model="contact.data"
           :sections="sections.data"
           doctype="Contact"
+          :docname="contact.data.name"
           @update="updateField"
           @reload="sections.reload"
         />
diff --git a/frontend/src/pages/MobileContact.vue b/frontend/src/pages/MobileContact.vue
index 728ebc16..95c6aa4f 100644
--- a/frontend/src/pages/MobileContact.vue
+++ b/frontend/src/pages/MobileContact.vue
@@ -130,9 +130,9 @@
             class="flex flex-1 flex-col justify-between overflow-hidden"
           >
             <SidePanelLayout
-              v-model="contact.data"
               :sections="sections.data"
               doctype="Contact"
+              :docname="contact.data.name"
               @update="updateField"
               @reload="sections.reload"
             />
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index c41ee341..d03c55cf 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -62,9 +62,9 @@
             class="flex flex-1 flex-col justify-between overflow-hidden"
           >
             <SidePanelLayout
-              v-model="deal.data"
               :sections="sections.data"
               doctype="CRM Deal"
+              :docname="deal.data.name"
               @update="updateField"
               @reload="sections.reload"
             >
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index 4e304d53..301f2a2e 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -67,9 +67,9 @@
             class="flex flex-1 flex-col justify-between overflow-hidden"
           >
             <SidePanelLayout
-              v-model="lead.data"
               :sections="sections.data"
               doctype="CRM Lead"
+              :docname="lead.data.name"
               @update="updateField"
               @reload="sections.reload"
             />
diff --git a/frontend/src/pages/MobileOrganization.vue b/frontend/src/pages/MobileOrganization.vue
index ba91553b..accd3831 100644
--- a/frontend/src/pages/MobileOrganization.vue
+++ b/frontend/src/pages/MobileOrganization.vue
@@ -112,9 +112,9 @@
             class="flex flex-1 flex-col justify-between overflow-hidden"
           >
             <SidePanelLayout
-              v-model="organization.doc"
               :sections="sections.data"
               doctype="CRM Organization"
+              :docname="organization.doc.name"
               @update="updateField"
               @reload="sections.reload"
             />
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index 3c1ce8b4..111857fd 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -106,9 +106,9 @@
         class="flex flex-1 flex-col justify-between overflow-hidden"
       >
         <SidePanelLayout
-          v-model="organization.doc"
           :sections="sections.data"
           doctype="CRM Organization"
+          :docname="organization.doc.name"
           @update="updateField"
           @reload="sections.reload"
         />

From b5dc2c73ab705b3cf5c1123b75e089fbfa2297cb Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 15 May 2025 01:15:25 +0530
Subject: [PATCH 09/46] fix: remove updateField event from various components

(cherry picked from commit baf344a6976b61a2c62a4cc2e60bf159f546ac49)
(cherry picked from commit 454dbd06cc39bbf93e955d0b6e462641c9c07d8d)
---
 frontend/src/components/Modals/SidePanelModal.vue |  2 +-
 frontend/src/components/SidePanelLayout.vue       | 15 ++++++++++++---
 frontend/src/pages/Contact.vue                    |  1 -
 frontend/src/pages/Deal.vue                       |  1 -
 frontend/src/pages/Lead.vue                       |  1 -
 frontend/src/pages/MobileContact.vue              |  1 -
 frontend/src/pages/MobileDeal.vue                 |  1 -
 frontend/src/pages/MobileLead.vue                 |  1 -
 frontend/src/pages/MobileOrganization.vue         |  1 -
 frontend/src/pages/Organization.vue               |  1 -
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Modals/SidePanelModal.vue b/frontend/src/components/Modals/SidePanelModal.vue
index d352b44f..800f9262 100644
--- a/frontend/src/components/Modals/SidePanelModal.vue
+++ b/frontend/src/components/Modals/SidePanelModal.vue
@@ -38,9 +38,9 @@
           />
           <div v-if="preview" class="flex flex-1 flex-col border rounded">
             <SidePanelLayout
-              v-model="data"
               :sections="tabs.data[0].sections"
               :doctype="_doctype"
+              docname=""
               :preview="true"
               v-slot="{ section }"
             >
diff --git a/frontend/src/components/SidePanelLayout.vue b/frontend/src/components/SidePanelLayout.vue
index c01607bf..9272c656 100644
--- a/frontend/src/components/SidePanelLayout.vue
+++ b/frontend/src/components/SidePanelLayout.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="!document.get.loading"
+    v-if="!document.get?.loading"
     class="sections flex flex-col overflow-y-auto"
   >
     <template v-for="(section, i) in _sections" :key="section.name">
@@ -412,11 +412,18 @@ const { getFormattedPercent, getFormattedFloat, getFormattedCurrency } =
 
 const { isManager, getUser } = usersStore()
 
-const emit = defineEmits(['update', 'reload'])
+const emit = defineEmits(['reload'])
 
 const showSidePanelModal = ref(false)
 
-const { document, triggerOnChange } = useDocument(props.doctype, props.docname)
+let document = { doc: {} }
+let triggerOnChange
+
+if (props.docname) {
+  let d = useDocument(props.doctype, props.docname)
+  document = d.document
+  triggerOnChange = d.triggerOnChange
+}
 
 const _sections = computed(() => {
   if (!props.sections?.length) return []
@@ -470,6 +477,8 @@ function parsedField(field) {
 }
 
 async function fieldChange(value, df) {
+  if (props.preview) return
+
   document.doc[df.fieldname] = value
 
   await triggerOnChange(df.fieldname)
diff --git a/frontend/src/pages/Contact.vue b/frontend/src/pages/Contact.vue
index e9fb75bb..42deaa90 100644
--- a/frontend/src/pages/Contact.vue
+++ b/frontend/src/pages/Contact.vue
@@ -124,7 +124,6 @@
           :sections="sections.data"
           doctype="Contact"
           :docname="contact.data.name"
-          @update="updateField"
           @reload="sections.reload"
         />
       </div>
diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index ad159f0e..9693d545 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -133,7 +133,6 @@
           :addContact="addContact"
           doctype="CRM Deal"
           :docname="deal.data.name"
-          @update="updateField"
           @reload="sections.reload"
         >
           <template #actions="{ section }">
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 8e68756e..502aff25 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -185,7 +185,6 @@
           :sections="sections.data"
           doctype="CRM Lead"
           :docname="lead.data.name"
-          @update="updateField"
           @reload="sections.reload"
         />
       </div>
diff --git a/frontend/src/pages/MobileContact.vue b/frontend/src/pages/MobileContact.vue
index 95c6aa4f..de28df96 100644
--- a/frontend/src/pages/MobileContact.vue
+++ b/frontend/src/pages/MobileContact.vue
@@ -133,7 +133,6 @@
               :sections="sections.data"
               doctype="Contact"
               :docname="contact.data.name"
-              @update="updateField"
               @reload="sections.reload"
             />
           </div>
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index d03c55cf..c793760f 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -65,7 +65,6 @@
               :sections="sections.data"
               doctype="CRM Deal"
               :docname="deal.data.name"
-              @update="updateField"
               @reload="sections.reload"
             >
               <template #actions="{ section }">
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index 301f2a2e..55a7a5f2 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -70,7 +70,6 @@
               :sections="sections.data"
               doctype="CRM Lead"
               :docname="lead.data.name"
-              @update="updateField"
               @reload="sections.reload"
             />
           </div>
diff --git a/frontend/src/pages/MobileOrganization.vue b/frontend/src/pages/MobileOrganization.vue
index accd3831..b68ac14d 100644
--- a/frontend/src/pages/MobileOrganization.vue
+++ b/frontend/src/pages/MobileOrganization.vue
@@ -115,7 +115,6 @@
               :sections="sections.data"
               doctype="CRM Organization"
               :docname="organization.doc.name"
-              @update="updateField"
               @reload="sections.reload"
             />
           </div>
diff --git a/frontend/src/pages/Organization.vue b/frontend/src/pages/Organization.vue
index 111857fd..a8c04de7 100644
--- a/frontend/src/pages/Organization.vue
+++ b/frontend/src/pages/Organization.vue
@@ -109,7 +109,6 @@
           :sections="sections.data"
           doctype="CRM Organization"
           :docname="organization.doc.name"
-          @update="updateField"
           @reload="sections.reload"
         />
       </div>

From 3f13a820e8bb8825b7cdbcb0f3cc7e8e178d4c83 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Wed, 14 May 2025 19:55:32 +0000
Subject: [PATCH 10/46] chore(release): Bumped to Version 1.42.1

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index a06d720b..2500b55f 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.42.0"
+__version__ = "1.42.1"
 __title__ = "Frappe CRM"
 

From 3c749516266f271f00557565ab7c26ef3b691786 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 15 May 2025 11:24:27 +0530
Subject: [PATCH 11/46] fix: cannot make call

(cherry picked from commit 18aef2376a966b91c89f25fbd5706ab09630c336)
---
 frontend/src/components/Activities/ActivityHeader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/Activities/ActivityHeader.vue b/frontend/src/components/Activities/ActivityHeader.vue
index 882d0d2e..ca4bc03c 100644
--- a/frontend/src/components/Activities/ActivityHeader.vue
+++ b/frontend/src/components/Activities/ActivityHeader.vue
@@ -184,7 +184,7 @@ const callActions = computed(() => {
     {
       label: __('Make a Call'),
       icon: h(PhoneIcon, { class: 'h-4 w-4' }),
-      onClick: () => makeCall(doc.data.mobile_no),
+      onClick: () => makeCall(props.doc.data.mobile_no),
       condition: () => callEnabled.value,
     },
   ]

From f33f5d5b2aaa2e57ade08e119fb6946be9317545 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Thu, 15 May 2025 05:58:48 +0000
Subject: [PATCH 12/46] chore(release): Bumped to Version 1.42.2

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 2500b55f..981b0448 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.42.1"
+__version__ = "1.42.2"
 __title__ = "Frappe CRM"
 

From 4d54e43b6cf9531fa318847613ad1a89782efe45 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Tue, 20 May 2025 09:11:18 +0000
Subject: [PATCH 13/46] chore(release): Bumped to Version 1.43.0

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 981b0448..b0e1a704 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.42.2"
+__version__ = "1.43.0"
 __title__ = "Frappe CRM"
 

From 4f2ca088fff6d3b01af8e3d3b5eb12ee5d59dc6f Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Thu, 22 May 2025 16:12:56 +0000
Subject: [PATCH 14/46] chore(release): Bumped to Version 1.44.0

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index b0e1a704..371bdd50 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.43.0"
+__version__ = "1.44.0"
 __title__ = "Frappe CRM"
 

From 4d40cad0d6ce42ebd17c54cb7807e65b537a5060 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Mon, 26 May 2025 08:30:42 +0000
Subject: [PATCH 15/46] chore(release): Bumped to Version 1.45.0

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 371bdd50..97339a2f 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.44.0"
+__version__ = "1.45.0"
 __title__ = "Frappe CRM"
 

From aa9319178603d0b2710280020eccadb59a33d8b9 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Mon, 26 May 2025 12:33:26 +0000
Subject: [PATCH 16/46] chore(release): Bumped to Version 1.46.0

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 97339a2f..0214e29f 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.45.0"
+__version__ = "1.46.0"
 __title__ = "Frappe CRM"
 

From 2871e0a41a5a584169d23bc54288fe6509172b2a Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Wed, 28 May 2025 08:37:10 +0000
Subject: [PATCH 17/46] chore(release): Bumped to Version 1.46.1

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 0214e29f..2ac0b176 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.46.0"
+__version__ = "1.46.1"
 __title__ = "Frappe CRM"
 

From 8002d8ffced715b1a8a81f9f299e64717e9d3a99 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Mon, 2 Jun 2025 13:54:51 +0000
Subject: [PATCH 18/46] chore(release): Bumped to Version 1.46.2

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 2ac0b176..defc228c 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.46.1"
+__version__ = "1.46.2"
 __title__ = "Frappe CRM"
 

From e4173cbbb5a6ad4d4cf248cf7b3a9fc079ffc396 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Thu, 5 Jun 2025 08:56:31 +0000
Subject: [PATCH 19/46] chore(release): Bumped to Version 1.46.3

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index defc228c..60d970fc 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.46.2"
+__version__ = "1.46.3"
 __title__ = "Frappe CRM"
 

From bb511674546561788bafaee4b7e5a64033aa8f41 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 20/46] 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 76cead420041c433a473e010515ed5c94df14d64 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 21/46] 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 6ad0742c9d0caf09733e5aabc88c3fb8aaee7f7d 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 22/46] 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 6bbe7a9442ac9069860fc2cc7a3e77fcdc04a3e7 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 23/46] 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 95184b55f0bd3e116d97a20b83b1ce65c94cada1 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Thu, 5 Jun 2025 16:22:54 +0530
Subject: [PATCH 24/46] 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">

From d9dee3fa16bce269004a4723fc963e0149699ec5 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Thu, 5 Jun 2025 10:54:40 +0000
Subject: [PATCH 25/46] chore(release): Bumped to Version 1.46.4

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 60d970fc..6bf73cf9 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.46.3"
+__version__ = "1.46.4"
 __title__ = "Frappe CRM"
 

From 715ec67a820415a986b3ed3e37e25985d1d3e1c7 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Fri, 6 Jun 2025 12:07:03 +0000
Subject: [PATCH 26/46] chore(release): Bumped to Version 1.47.0

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 6bf73cf9..3f2544f8 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.46.4"
+__version__ = "1.47.0"
 __title__ = "Frappe CRM"
 

From f4c86811a1c527108f3aba979f263897b63b06b6 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 6 Jun 2025 17:50:48 +0530
Subject: [PATCH 27/46] fix: activity is not loading

(cherry picked from commit 8f81d207b89a4f471f594dd3a2a702f6282f36de)
---
 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 29733580..d4b670e1 100644
--- a/frontend/src/components/Activities/Activities.vue
+++ b/frontend/src/components/Activities/Activities.vue
@@ -257,7 +257,7 @@
               </span>
               <span v-if="activity.value">{{ __(activity.value) }}</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
@@ -273,7 +273,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 b13dc763585f91ef0c529590b864329c5cce77ab Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Fri, 6 Jun 2025 12:23:57 +0000
Subject: [PATCH 28/46] chore(release): Bumped to Version 1.47.1

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 3f2544f8..2454c159 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.47.0"
+__version__ = "1.47.1"
 __title__ = "Frappe CRM"
 

From d7f442d734a784f96b8390c9174098ecd1b9e974 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 6 Jun 2025 20:35:25 +0530
Subject: [PATCH 29/46] fix: onLoad & onSave

(cherry picked from commit f72ab39c933f02dad4991261cf985804a97eadcc)
---
 frontend/src/data/document.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/src/data/document.js b/frontend/src/data/document.js
index a38e8ed6..67302549 100644
--- a/frontend/src/data/document.js
+++ b/frontend/src/data/document.js
@@ -19,6 +19,7 @@ export function useDocument(doctype, docname) {
         onSuccess: async () => await setupFormScript(),
         setValue: {
           onSuccess: () => {
+            triggerOnSave()
             toast.success(__('Document updated successfully'))
           },
           onError: (err) => {
@@ -76,7 +77,7 @@ export function useDocument(doctype, docname) {
     }
     controllersCache[doctype][docname || ''] = organizedControllers
 
-    triggerOnload()
+    triggerOnLoad()
   }
 
   function getControllers(row = null) {
@@ -95,9 +96,16 @@ export function useDocument(doctype, docname) {
     return []
   }
 
-  async function triggerOnload() {
+  async function triggerOnLoad() {
     const handler = async function () {
-      await this.onload?.()
+      await this.onLoad?.()
+    }
+    await trigger(handler)
+  }
+
+  async function triggerOnSave() {
+    const handler = async function () {
+      await this.onSave?.()
     }
     await trigger(handler)
   }
@@ -199,11 +207,12 @@ export function useDocument(doctype, docname) {
     document: documentsCache[doctype][docname || ''],
     assignees,
     getControllers,
-    triggerOnload,
+    triggerOnLoad,
+    triggerOnSave,
+    triggerOnRefresh,
     triggerOnChange,
     triggerOnRowAdd,
     triggerOnRowRemove,
-    triggerOnRefresh,
     setupFormScript,
     triggerOnCreateLead,
     triggerConvertToDeal,

From 9cc09f520c289a60a51c38c5b3482a23720501ac Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 6 Jun 2025 20:49:58 +0530
Subject: [PATCH 30/46] fix: use document.doc in status dropdown

(cherry picked from commit f58d44bf9c453ced17085f6c686aa662f8a6cacb)
---
 frontend/src/pages/Deal.vue       | 14 +++++++++++---
 frontend/src/pages/Lead.vue       | 14 +++++++++++---
 frontend/src/pages/MobileDeal.vue | 14 +++++++++++---
 frontend/src/pages/MobileLead.vue | 14 +++++++++++---
 frontend/src/stores/statuses.js   |  2 +-
 5 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 9265db2e..4f0952e4 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -22,10 +22,11 @@
         doctype="CRM Deal"
       />
       <Dropdown
+        v-if="document.doc"
         :options="
           statusOptions(
             'deal',
-            updateField,
+            updateStatus,
             document.statuses?.length
               ? document.statuses
               : deal.data._customStatuses,
@@ -33,9 +34,11 @@
         "
       >
         <template #default="{ open }">
-          <Button :label="deal.data.status">
+          <Button :label="document.doc.status">
             <template #prefix>
-              <IndicatorIcon :class="getDealStatus(deal.data.status).color" />
+              <IndicatorIcon
+                :class="getDealStatus(document.doc.status).color"
+              />
             </template>
             <template #suffix>
               <FeatherIcon
@@ -738,4 +741,9 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
+
+function updateStatus(value) {
+  document.doc.status = value
+  document.save.submit()
+}
 </script>
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index f8077b2a..8577725b 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -22,10 +22,11 @@
         doctype="CRM Lead"
       />
       <Dropdown
+        v-if="document.doc"
         :options="
           statusOptions(
             'lead',
-            updateField,
+            updateStatus,
             document.statuses?.length
               ? document.statuses
               : lead.data._customStatuses,
@@ -33,9 +34,11 @@
         "
       >
         <template #default="{ open }">
-          <Button :label="lead.data.status">
+          <Button :label="document.doc.status">
             <template #prefix>
-              <IndicatorIcon :class="getLeadStatus(lead.data.status).color" />
+              <IndicatorIcon
+                :class="getLeadStatus(document.doc.status).color"
+              />
             </template>
             <template #suffix>
               <FeatherIcon
@@ -728,4 +731,9 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
+
+function updateStatus(value) {
+  document.doc.status = value
+  document.save.submit()
+}
 </script>
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index 2be3f754..ae8fd3bd 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -10,10 +10,11 @@
       </Breadcrumbs>
       <div class="absolute right-0">
         <Dropdown
+          v-if="document.doc"
           :options="
             statusOptions(
               'deal',
-              updateField,
+              updateStatus,
               document.statuses?.length
                 ? document.statuses
                 : deal.data._customStatuses,
@@ -21,9 +22,11 @@
           "
         >
           <template #default="{ open }">
-            <Button :label="deal.data.status">
+            <Button :label="document.doc.status">
               <template #prefix>
-                <IndicatorIcon :class="getDealStatus(deal.data.status).color" />
+                <IndicatorIcon
+                  :class="getDealStatus(document.doc.status).color"
+                />
               </template>
               <template #suffix>
                 <FeatherIcon
@@ -624,4 +627,9 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
+
+function updateStatus(value) {
+  document.doc.status = value
+  document.save.submit()
+}
 </script>
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index a60565aa..532a681a 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -10,10 +10,11 @@
       </Breadcrumbs>
       <div class="absolute right-0">
         <Dropdown
+          v-if="document.doc"
           :options="
             statusOptions(
               'lead',
-              updateField,
+              updateStatus,
               document.statuses?.length
                 ? document.statuses
                 : lead.data._customStatuses,
@@ -21,9 +22,11 @@
           "
         >
           <template #default="{ open }">
-            <Button :label="lead.data.status">
+            <Button :label="document.doc.status">
               <template #prefix>
-                <IndicatorIcon :class="getLeadStatus(lead.data.status).color" />
+                <IndicatorIcon
+                  :class="getLeadStatus(document.doc.status).color"
+                />
               </template>
               <template #suffix>
                 <FeatherIcon
@@ -473,4 +476,9 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
+
+function updateStatus(value) {
+  document.doc.status = value
+  document.save.submit()
+}
 </script>
diff --git a/frontend/src/stores/statuses.js b/frontend/src/stores/statuses.js
index 044ef18b..cf3fdf41 100644
--- a/frontend/src/stores/statuses.js
+++ b/frontend/src/stores/statuses.js
@@ -96,7 +96,7 @@ export const statusesStore = defineStore('crm-statuses', () => {
         icon: () => h(IndicatorIcon, { class: statusesByName[status]?.color }),
         onClick: () => {
           capture('status_changed', { doctype, status })
-          action && action('status', statusesByName[status]?.name)
+          action && action(statusesByName[status]?.name)
         },
       })
     }

From a4716e78996a397c7d0124fc8fadfbff2a2a283a Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 6 Jun 2025 21:01:20 +0530
Subject: [PATCH 31/46] fix: allow snake & camel case for on load, on save,
 convert to deal, on create lead

(cherry picked from commit c6e9d71e1f5178e7318be294ee3d29acbf562dc2)
---
 frontend/src/data/document.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/data/document.js b/frontend/src/data/document.js
index 67302549..bd412a44 100644
--- a/frontend/src/data/document.js
+++ b/frontend/src/data/document.js
@@ -98,14 +98,14 @@ export function useDocument(doctype, docname) {
 
   async function triggerOnLoad() {
     const handler = async function () {
-      await this.onLoad?.()
+      await (this.onLoad?.() || this.on_load?.() || this.onload?.())
     }
     await trigger(handler)
   }
 
   async function triggerOnSave() {
     const handler = async function () {
-      await this.onSave?.()
+      await (this.onSave?.() || this.on_save?.())
     }
     await trigger(handler)
   }
@@ -164,7 +164,7 @@ export function useDocument(doctype, docname) {
   async function triggerOnCreateLead() {
     const args = Array.from(arguments)
     const handler = async function () {
-      await this.on_create_lead?.(...args)
+      await (this.onCreateLead?.(...args) || this.on_create_lead?.(...args))
     }
     await trigger(handler)
   }
@@ -172,7 +172,8 @@ export function useDocument(doctype, docname) {
   async function triggerConvertToDeal() {
     const args = Array.from(arguments)
     const handler = async function () {
-      await this.convert_to_deal?.(...args)
+      await (this.convertToDeal?.(...args) ||
+        this.on_convert_to_deal?.(...args))
     }
     await trigger(handler)
   }

From 89da8d2e8db03261f8f9984b3010d6ec13ab46fe Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 6 Jun 2025 21:09:27 +0530
Subject: [PATCH 32/46] refactor: statusOptions code

(cherry picked from commit 5e616f1a50d1a6b6e4d6190f554edd704cb9b25f)
---
 frontend/src/pages/Deal.vue       | 15 +--------------
 frontend/src/pages/Lead.vue       | 15 +--------------
 frontend/src/pages/MobileDeal.vue | 15 +--------------
 frontend/src/pages/MobileLead.vue | 15 +--------------
 frontend/src/stores/statuses.js   | 11 +++++++++--
 5 files changed, 13 insertions(+), 58 deletions(-)

diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue
index 4f0952e4..e3d09fa7 100644
--- a/frontend/src/pages/Deal.vue
+++ b/frontend/src/pages/Deal.vue
@@ -23,15 +23,7 @@
       />
       <Dropdown
         v-if="document.doc"
-        :options="
-          statusOptions(
-            'deal',
-            updateStatus,
-            document.statuses?.length
-              ? document.statuses
-              : deal.data._customStatuses,
-          )
-        "
+        :options="statusOptions('deal', document, deal.data._customStatuses)"
       >
         <template #default="{ open }">
           <Button :label="document.doc.status">
@@ -741,9 +733,4 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
-
-function updateStatus(value) {
-  document.doc.status = value
-  document.save.submit()
-}
 </script>
diff --git a/frontend/src/pages/Lead.vue b/frontend/src/pages/Lead.vue
index 8577725b..f722054c 100644
--- a/frontend/src/pages/Lead.vue
+++ b/frontend/src/pages/Lead.vue
@@ -23,15 +23,7 @@
       />
       <Dropdown
         v-if="document.doc"
-        :options="
-          statusOptions(
-            'lead',
-            updateStatus,
-            document.statuses?.length
-              ? document.statuses
-              : lead.data._customStatuses,
-          )
-        "
+        :options="statusOptions('lead', document, lead.data._customStatuses)"
       >
         <template #default="{ open }">
           <Button :label="document.doc.status">
@@ -731,9 +723,4 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
-
-function updateStatus(value) {
-  document.doc.status = value
-  document.save.submit()
-}
 </script>
diff --git a/frontend/src/pages/MobileDeal.vue b/frontend/src/pages/MobileDeal.vue
index ae8fd3bd..71995d88 100644
--- a/frontend/src/pages/MobileDeal.vue
+++ b/frontend/src/pages/MobileDeal.vue
@@ -11,15 +11,7 @@
       <div class="absolute right-0">
         <Dropdown
           v-if="document.doc"
-          :options="
-            statusOptions(
-              'deal',
-              updateStatus,
-              document.statuses?.length
-                ? document.statuses
-                : deal.data._customStatuses,
-            )
-          "
+          :options="statusOptions('deal', document, deal.data._customStatuses)"
         >
           <template #default="{ open }">
             <Button :label="document.doc.status">
@@ -627,9 +619,4 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
-
-function updateStatus(value) {
-  document.doc.status = value
-  document.save.submit()
-}
 </script>
diff --git a/frontend/src/pages/MobileLead.vue b/frontend/src/pages/MobileLead.vue
index 532a681a..da7574dd 100644
--- a/frontend/src/pages/MobileLead.vue
+++ b/frontend/src/pages/MobileLead.vue
@@ -11,15 +11,7 @@
       <div class="absolute right-0">
         <Dropdown
           v-if="document.doc"
-          :options="
-            statusOptions(
-              'lead',
-              updateStatus,
-              document.statuses?.length
-                ? document.statuses
-                : lead.data._customStatuses,
-            )
-          "
+          :options="statusOptions('lead', document, lead.data._customStatuses)"
         >
           <template #default="{ open }">
             <Button :label="document.doc.status">
@@ -476,9 +468,4 @@ function reloadAssignees(data) {
     assignees.reload()
   }
 }
-
-function updateStatus(value) {
-  document.doc.status = value
-  document.save.submit()
-}
 </script>
diff --git a/frontend/src/stores/statuses.js b/frontend/src/stores/statuses.js
index cf3fdf41..9a63da26 100644
--- a/frontend/src/stores/statuses.js
+++ b/frontend/src/stores/statuses.js
@@ -77,10 +77,14 @@ export const statusesStore = defineStore('crm-statuses', () => {
     return communicationStatuses[name]
   }
 
-  function statusOptions(doctype, action, statuses = []) {
+  function statusOptions(doctype, document, statuses = []) {
     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]
@@ -96,7 +100,10 @@ export const statusesStore = defineStore('crm-statuses', () => {
         icon: () => h(IndicatorIcon, { class: statusesByName[status]?.color }),
         onClick: () => {
           capture('status_changed', { doctype, status })
-          action && action(statusesByName[status]?.name)
+          if (document) {
+            document.doc.status = statusesByName[status]?.name
+            document.save.submit()
+          }
         },
       })
     }

From da4d60db19d260834d868c9044fd6ea0111bec9b Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 6 Jun 2025 21:14:20 +0530
Subject: [PATCH 33/46] fix: only load assignee if docname is passed

(cherry picked from commit 2a817e5861ae040fd8abd8823aad5d6e97fd0fd7)
---
 frontend/src/data/document.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/data/document.js b/frontend/src/data/document.js
index bd412a44..7d456676 100644
--- a/frontend/src/data/document.js
+++ b/frontend/src/data/document.js
@@ -39,7 +39,7 @@ export function useDocument(doctype, docname) {
   const assignees = createResource({
     url: 'crm.api.doc.get_assigned_users',
     cache: `assignees:${doctype}:${docname}`,
-    auto: true,
+    auto: docname ? true : false,
     params: {
       doctype: doctype,
       name: docname,

From 8c43732d2e7ce87ef15391d96d46a741b4dca0e7 Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Fri, 6 Jun 2025 15:48:46 +0000
Subject: [PATCH 34/46] chore(release): Bumped to Version 1.47.2

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 2454c159..98544b02 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.47.1"
+__version__ = "1.47.2"
 __title__ = "Frappe CRM"
 

From 90e80da2085dafae336c33e22543564b0508c21c Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Mon, 9 Jun 2025 09:31:43 +0000
Subject: [PATCH 35/46] chore(release): Bumped to Version 1.47.3

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 98544b02..35aaba0e 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.47.2"
+__version__ = "1.47.3"
 __title__ = "Frappe CRM"
 

From ac08ca8390c66cd5ea58660c9feeb66fe138a01f Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Mon, 9 Jun 2025 16:49:09 +0530
Subject: [PATCH 36/46] fix: future date is not captured in pretty date

(cherry picked from commit dba6dd19836501e595da5d7efe91bf78134de532)
---
 frontend/src/utils/index.js | 54 ++++++++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 3 deletions(-)

diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 68a2abe2..f2633b2f 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -86,11 +86,32 @@ export function prettyDate(date, mini = false) {
 
   let dayDiff = Math.floor(diff / 86400)
 
-  if (isNaN(dayDiff) || dayDiff < 0) return ''
+  if (isNaN(dayDiff)) return ''
 
   if (mini) {
     // Return short format of time difference
-    if (dayDiff == 0) {
+    if (dayDiff < 0) {
+      if (Math.abs(dayDiff) < 1) {
+        if (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)])
+        }
+      }
+      if (Math.abs(dayDiff) == 1) {
+        return __('tomorrow')
+      } else if (Math.abs(dayDiff) < 7) {
+        return __('in {0} d', [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) {
+        return __('in {0} M', [Math.floor(Math.abs(dayDiff) / 30)])
+      } else {
+        return __('in {0} y', [Math.floor(Math.abs(dayDiff) / 365)])
+      }
+    } else if (dayDiff == 0) {
       if (diff < 60) {
         return __('now')
       } else if (diff < 3600) {
@@ -111,7 +132,34 @@ export function prettyDate(date, mini = false) {
     }
   } else {
     // Return long format of time difference
-    if (dayDiff == 0) {
+    if (dayDiff < 0) {
+      if (Math.abs(dayDiff) < 1) {
+        if (diff < 60) {
+          return __('just now')
+        } else if (diff < 120) {
+          return __('in 1 minute')
+        } else if (diff < 3600) {
+          return __('in {0} minutes', [Math.floor(diff / 60)])
+        } else if (diff < 7200) {
+          return __('in 1 hour')
+        } else if (diff < 86400) {
+          return __('in {0} hours', [Math.floor(diff / 3600)])
+        }
+      }
+      if (Math.abs(dayDiff) == 1) {
+        return __('tomorrow')
+      } else if (Math.abs(dayDiff) < 7) {
+        return __('in {0} days', [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) {
+        return __('in {0} months', [Math.floor(Math.abs(dayDiff) / 30)])
+      } else if (Math.abs(dayDiff) < 730) {
+        return __('in 1 year')
+      } else {
+        return __('in {0} years', [Math.floor(Math.abs(dayDiff) / 365)])
+      }
+    } else if (dayDiff == 0) {
       if (diff < 60) {
         return __('just now')
       } else if (diff < 120) {

From 5a09090be82e82218fbf0dd9a4beffbd593803ea Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Mon, 9 Jun 2025 11:23:47 +0000
Subject: [PATCH 37/46] chore(release): Bumped to Version 1.47.4

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 35aaba0e..f126196f 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.47.3"
+__version__ = "1.47.4"
 __title__ = "Frappe CRM"
 

From c86278756122e4423c54102c5aab05b1a65ccbab Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Thu, 12 Jun 2025 18:07:07 +0530
Subject: [PATCH 38/46] fix: removed leads organization logo

(cherry picked from commit e079980598ecb2e2a2728e6bf213dc5b42e643f3)
---
 frontend/src/components/ListViews/LeadsListView.vue | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/frontend/src/components/ListViews/LeadsListView.vue b/frontend/src/components/ListViews/LeadsListView.vue
index 401094ef..a45e9e7d 100644
--- a/frontend/src/components/ListViews/LeadsListView.vue
+++ b/frontend/src/components/ListViews/LeadsListView.vue
@@ -72,15 +72,6 @@
               size="sm"
             />
           </div>
-          <div v-else-if="column.key === 'organization'">
-            <Avatar
-              v-if="item"
-              class="flex items-center"
-              :image="item"
-              :label="item"
-              size="sm"
-            />
-          </div>
           <div v-else-if="column.key === 'lead_owner'">
             <Avatar
               v-if="item.full_name"

From cf9797fbc44f16e6ffcbee3ee0e5374f9f4734ab Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Thu, 12 Jun 2025 12:46:55 +0000
Subject: [PATCH 39/46] chore(release): Bumped to Version 1.47.5

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index f126196f..ec6344f4 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.47.4"
+__version__ = "1.47.5"
 __title__ = "Frappe CRM"
 

From 0eef9b485f551933b66d11d7bbf8bac1ff88695f Mon Sep 17 00:00:00 2001
From: Pratik <badhepd@gmail.com>
Date: Fri, 13 Jun 2025 12:51:04 +0000
Subject: [PATCH 40/46] fix: git command error

(cherry picked from commit 824dc8dcdde6ad80684685e41b477ed48087b845)
---
 crm/www/crm.py                                | 20 -------------------
 frontend/src/components/Modals/AboutModal.vue | 18 -----------------
 2 files changed, 38 deletions(-)

diff --git a/crm/www/crm.py b/crm/www/crm.py
index 94f8142a..070372dd 100644
--- a/crm/www/crm.py
+++ b/crm/www/crm.py
@@ -45,7 +45,6 @@ def get_boot():
 				"user": frappe.db.get_value("User", frappe.session.user, "time_zone")
 				or get_system_timezone(),
 			},
-			"app_version": get_app_version(),
 		}
 	)
 
@@ -54,25 +53,6 @@ def get_default_route():
 	return "/crm"
 
 
-def get_app_version():
-	app = "crm"
-	branch = run_git_command(f"cd ../apps/{app} && git rev-parse --abbrev-ref HEAD")
-	commit = run_git_command(f"git -C ../apps/{app} rev-parse --short=7 HEAD")
-	tag = run_git_command(f"git -C ../apps/{app} describe --tags --abbrev=0")
-	dirty = run_git_command(f"git -C ../apps/{app} diff --quiet || echo 'dirty'") == "dirty"
-	commit_date = run_git_command(f"git -C ../apps/{app} log -1 --format=%cd")
-	commit_message = run_git_command(f"git -C ../apps/{app} log -1 --pretty=%B")
-
-	return {
-		"branch": branch,
-		"commit": commit,
-		"commit_date": commit_date,
-		"commit_message": commit_message,
-		"tag": tag,
-		"dirty": dirty,
-	}
-
-
 def run_git_command(command):
 	try:
 		with open(os.devnull, "wb") as null_stream:
diff --git a/frontend/src/components/Modals/AboutModal.vue b/frontend/src/components/Modals/AboutModal.vue
index b118d3f4..a6addea0 100644
--- a/frontend/src/components/Modals/AboutModal.vue
+++ b/frontend/src/components/Modals/AboutModal.vue
@@ -6,22 +6,6 @@
           <div class="flex flex-col items-center">
             <CRMLogo class="mb-3 size-12" />
             <h3 class="font-semibold text-xl text-ink-gray-9">Frappe CRM</h3>
-            <div class="flex items-center mt-1">
-              <div class="text-base text-ink-gray-6">
-                {{ appVersion.branch != 'main' ? appVersion.branch : '' }}
-                <template v-if="appVersion.branch != 'main'">
-                  ({{ appVersion.commit }})
-                </template>
-                <template v-else>{{ appVersion.tag }}</template>
-              </div>
-
-              <Tooltip
-                :text="`${appVersion.commit_message} - ${appVersion.commit_date}`"
-                placement="top"
-              >
-                <LucideInfo class="size-3.5 text-ink-gray-8 ml-1" />
-              </Tooltip>
-            </div>
           </div>
         </div>
         <hr class="border-t my-3 mx-2" />
@@ -95,6 +79,4 @@ let links = [
     icon: LucideHeadset,
   },
 ]
-
-let appVersion = window.app_version
 </script>

From 89b89eeafcfd635822b71ac6410914a59158ee7c Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Mon, 16 Jun 2025 07:14:01 +0000
Subject: [PATCH 41/46] chore(release): Bumped to Version 1.47.6

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index ec6344f4..1dd65b85 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.47.5"
+__version__ = "1.47.6"
 __title__ = "Frappe CRM"
 

From 9c90f29281d24076beea298a218d97f0f634c1dc Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Tue, 24 Jun 2025 05:05:39 +0000
Subject: [PATCH 42/46] chore(release): Bumped to Version 1.48.0

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index 1dd65b85..db6bc68f 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.47.6"
+__version__ = "1.48.0"
 __title__ = "Frappe CRM"
 

From 1519b3539c30d511fdd4c09be947f26f1c6eb5b4 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 24 Jun 2025 11:44:13 +0530
Subject: [PATCH 43/46] fix: user with System Manager role is admin

(cherry picked from commit b5ed9692dff4997335ae389ac4f836bedc3e7898)
---
 frontend/src/components/Settings/Users.vue | 2 +-
 frontend/src/stores/users.js               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index 6ea15809..dc07ac30 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -150,7 +150,7 @@ import { usersStore } from '@/stores/users'
 import { Avatar, TextInput, toast, call } from 'frappe-ui'
 import { ref, computed, h, onMounted } from 'vue'
 
-const { users, getUserRole, isAdmin, isManager } = usersStore()
+const { users, isAdmin, isManager } = usersStore()
 
 const showAddExistingModal = ref(false)
 const searchRef = ref(null)
diff --git a/frontend/src/stores/users.js b/frontend/src/stores/users.js
index 3614bda5..e0122f8a 100644
--- a/frontend/src/stores/users.js
+++ b/frontend/src/stores/users.js
@@ -50,7 +50,7 @@ export const usersStore = defineStore('crm-users', () => {
   }
 
   function isAdmin(email) {
-    return getUser(email).is_admin
+    return getUser(email).role === 'System Manager' || getUser(email).is_admin
   }
 
   function isManager(email) {

From a542ecc5c8e9de02a0eb353cd5f8963c9e04dd9f Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Tue, 24 Jun 2025 06:29:06 +0000
Subject: [PATCH 44/46] chore(release): Bumped to Version 1.48.1

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index db6bc68f..e7dd277e 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.48.0"
+__version__ = "1.48.1"
 __title__ = "Frappe CRM"
 

From 461498f9f6146d48daea1c6c7fb56e95f68b5829 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Tue, 24 Jun 2025 12:11:39 +0530
Subject: [PATCH 45/46] fix: make header sticky

(cherry picked from commit 3c1ce1fe2741a5d2f4faa4a0a5be71f188439f07)
---
 frontend/src/components/Settings/Users.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/Settings/Users.vue b/frontend/src/components/Settings/Users.vue
index dc07ac30..0d4670ed 100644
--- a/frontend/src/components/Settings/Users.vue
+++ b/frontend/src/components/Settings/Users.vue
@@ -59,7 +59,10 @@
     </div>
 
     <!-- Users List -->
-    <div v-if="!users.loading && users.data?.crmUsers?.length > 1">
+    <div
+      class="flex flex-col overflow-hidden"
+      v-if="!users.loading && users.data?.crmUsers?.length > 1"
+    >
       <div class="flex items-center justify-between mb-4">
         <TextInput
           ref="searchRef"
@@ -83,7 +86,7 @@
           ]"
         />
       </div>
-      <ul class="divide-y divide-outline-gray-modals overflow-auto">
+      <ul class="divide-y divide-outline-gray-modals overflow-y-auto">
         <template v-for="user in usersList" :key="user.name">
           <li class="flex items-center justify-between py-2">
             <div class="flex items-center">

From 52bf09f27e2c43b7f50072855c92dfec7d96960b Mon Sep 17 00:00:00 2001
From: Frappe PR Bot <developers@frappe.io>
Date: Tue, 24 Jun 2025 06:44:46 +0000
Subject: [PATCH 46/46] chore(release): Bumped to Version 1.48.2

---
 crm/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crm/__init__.py b/crm/__init__.py
index e7dd277e..ded803dd 100644
--- a/crm/__init__.py
+++ b/crm/__init__.py
@@ -1,4 +1,4 @@
 
-__version__ = "1.48.1"
+__version__ = "1.48.2"
 __title__ = "Frappe CRM"