chore(release): Bumped to Version 1.53.1

(cherry picked from commit 9e92282e25cd1d3e5c33b87b02ad6dfdc09158cc)

.github/helper/update_pot_file.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+set -e
+cd ~ || exit
+
+echo "Setting Up Bench..."
+
+pip install frappe-bench
+bench -v init frappe-bench --skip-assets --skip-redis-config-generation --python "$(which python)" --frappe-branch "${BASE_BRANCH}"
+cd ./frappe-bench || exit
+
+echo "Get FCRM..."
+bench get-app --skip-assets crm "${GITHUB_WORKSPACE}"
+
+echo "Generating POT file..."
+bench generate-pot-file --app crm
+
+cd ./apps/crm || exit
+
+echo "Configuring git user..."
+git config user.email "developers@erpnext.com"
+git config user.name "frappe-pr-bot"
+
+echo "Setting the correct git remote..."
+# Here, the git remote is a local file path by default. Let's change it to the upstream repo.
+git remote set-url upstream https://github.com/frappe/crm.git
+
+echo "Creating a new branch..."
+isodate=$(date -u +"%Y-%m-%d")
+branch_name="pot_${BASE_BRANCH}_${isodate}"
+git checkout -b "${branch_name}"
+
+echo "Commiting changes..."
+git add crm/locale/main.pot
+git commit -m "chore: update POT file"
+
+gh auth setup-git
+git push -u upstream "${branch_name}"
+
+echo "Creating a PR..."
+gh pr create --fill --base "${BASE_BRANCH}" --head "${branch_name}" -R frappe/crm

.github/workflows/builds.yml

@@ -46,6 +46,7 @@ jobs:
       - name: Set Image Tag
         run: |
           echo "IMAGE_TAG=${{ github.ref_name == 'develop' && 'latest' || 'v15' }}" >> $GITHUB_ENV
+          echo "STABLE_TAG=${{ github.ref_name == 'develop' && 'nightly' || 'stable' }}" >> $GITHUB_ENV
 
       - uses: actions/checkout@v4
         with:
@@ -60,7 +61,9 @@ jobs:
           file: builds/images/layered/Containerfile
           tags: >
             ghcr.io/${{ github.repository }}:${{ github.ref_name }},
-            ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }}
+            ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }},
+            ghcr.io/${{ github.repository }}:${{ env.STABLE_TAG }}
+            
           build-args: |
             "FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}"
             "APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}"

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
           check-latest: true
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml', '**/setup.py', '**/setup.cfg') }}
@@ -63,7 +63,7 @@ jobs:
         id: yarn-cache-dir-path
         run: 'echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT'
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

.github/workflows/generate-pot-file.yml

@@ -0,0 +1,35 @@
+name: Regenerate POT file (translatable strings)
+on:
+  schedule:
+    # 9:30 UTC => 3 PM IST Sunday
+    - cron: "30 9 * * 0"
+  workflow_dispatch:
+
+jobs:
+  regenerate-pot-file:
+    name: Regenerate POT file
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ["develop"]
+    permissions:
+      contents: write
+
+    steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+          with:
+            ref: ${{ matrix.branch }}
+
+        - name: Setup Python
+          uses: actions/setup-python@v5
+          with:
+            python-version: "3.12"
+
+        - name: Run script to update POT file
+          run: |
+            bash ${GITHUB_WORKSPACE}/.github/helper/update_pot_file.sh
+          env:
+            GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+            BASE_BRANCH: ${{ matrix.branch }}

.gitignore

@@ -7,6 +7,5 @@ dev-dist
 tags
 node_modules
 crm/public/frontend
-frontend/yarn.lock
 crm/www/crm.html
 build

README.md

@@ -8,7 +8,7 @@
 
 **Simplify Sales, Amplify Relationships**
 
-![GitHub release (latest by date)](https://img.shields.io/github/v/release/frappe/crm)
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/frappe/crm)](https://github.com/frappe/crm/releases)
 
 <div>
     <picture>
@@ -75,6 +75,7 @@ The motivation behind building Frappe CRM stems from the need for a simple, cust
 ### Integrations
 
 -   **Twilio:** Integrate Twilio to make and receive calls from the CRM. You can also record calls. It is a built-in integration.
+-   **Exotel:** Integrate Exotel to make and receive calls via agents mobile phone from the CRM. You can also record calls. It is a built-in integration.
 -   **WhatsApp:** Integrate WhatsApp to send and receive messages from the CRM. [Frappe WhatsApp](https://github.com/shridarpatil/frappe_whatsapp) is used for this integration.
 -   **ERPNext:** Integrate with [ERPNext](https://erpnext.com) to extend the CRM capabilities to include invoicing, accounting, and more.
 
@@ -83,6 +84,14 @@ The motivation behind building Frappe CRM stems from the need for a simple, cust
 - [Frappe Framework](https://github.com/frappe/frappe): A full-stack web application framework.
 - [Frappe UI](https://github.com/frappe/frappe-ui): A Vue-based UI library, to provide a modern user interface.
 
+### Compatibility
+This app is compatible with the following versions of Frappe and ERPNext:
+
+| CRM branch            | Stability | Frappe branch        | ERPNext branch       |
+| :-------------------- | :-------- | :------------------- | :------------------- |
+| main - v1.x           | stable    | v15.x                | v15.x                |
+| develop - future/v2.x | unstable  | develop - future/v16 | develop - future/v16 |
+
 ## Getting Started (Production)
 
 ### Managed Hosting
@@ -180,6 +189,7 @@ You need Docker, docker-compose and git setup on your machine. Refer [Docker doc
 -   [Discuss Forum](https://discuss.frappe.io/c/frappe-crm)
 -   [Documentation](https://docs.frappe.io/crm)
 -   [YouTube](https://www.youtube.com/channel/UCn3bV5kx77HsVwtnlCeEi_A)
+-   [X/Twitter](https://x.com/frappetech)
 
 <br>
 <br>

crm/__init__.py

@@ -1,4 +1,4 @@
 
-__version__ = "1.32.2"
+__version__ = "1.53.1"
 __title__ = "Frappe CRM"
 

crm/api/__init__.py

@@ -1,9 +1,10 @@
-from bs4 import BeautifulSoup
 import frappe
-from frappe.translate import get_all_translations
+from bs4 import BeautifulSoup
-from frappe.utils import validate_email_address, split_emails, cstr
+from frappe.config import get_modules_from_all_apps_for_user
-from frappe.utils.telemetry import POSTHOG_HOST_FIELD, POSTHOG_PROJECT_FIELD
 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
+from frappe.utils.telemetry import POSTHOG_HOST_FIELD, POSTHOG_PROJECT_FIELD
 
 
 @frappe.whitelist(allow_guest=True)
@@ -44,7 +45,7 @@ def get_user_signature():
 	if html_signature:
 		_signature = html_signature.renderContents()
 	content = ""
-	if (cstr(_signature) or signature):
+	if cstr(_signature) or signature:
 		content = f'<br><p class="signature">{signature}</p>'
 	return content
 
@@ -63,15 +64,22 @@ def check_app_permission():
 	if frappe.session.user == "Administrator":
 		return True
 
+	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(role in ["System Manager", "Sales User", "Sales Manager", "Sales Master Manager"] for role in roles):
+	if any(
+		role in ["System Manager", "Sales User", "Sales Manager"] for role in roles
+	):
 		return True
 
 	return False
 
 
 @frappe.whitelist(allow_guest=True)
-def accept_invitation(key: str = None):
+def accept_invitation(key: str | None = None):
 	if not key:
 		frappe.throw("Invalid or expired key")
 
@@ -91,6 +99,11 @@ def accept_invitation(key: str = None):
 
 @frappe.whitelist()
 def invite_by_email(emails: str, role: str):
+	frappe.only_for(["Sales Manager", "System Manager"])
+
+	if role not in ["System Manager", "Sales Manager", "Sales User"]:
+		frappe.throw("Cannot invite for this role")
+
 	if not emails:
 		return
 	email_string = validate_email_address(emails, throw=False)
@@ -100,7 +113,10 @@ def invite_by_email(emails: str, role: str):
 	existing_members = frappe.db.get_all("User", filters={"email": ["in", email_list]}, pluck="email")
 	existing_invites = frappe.db.get_all(
 		"CRM Invitation",
-		filters={"email": ["in", email_list], "role": ["in", ["Sales Manager", "Sales User"]]},
+		filters={
+			"email": ["in", email_list],
+			"role": ["in", ["System Manager", "Sales Manager", "Sales User"]],
+		},
 		pluck="email",
 	)
 
@@ -109,6 +125,12 @@ def invite_by_email(emails: str, role: str):
 	for email in to_invite:
 		frappe.get_doc(doctype="CRM Invitation", email=email, role=role).insert(ignore_permissions=True)
 
+	return {
+		"existing_members": existing_members,
+		"existing_invites": existing_invites,
+		"to_invite": to_invite,
+	}
+
 
 @frappe.whitelist()
 def get_file_uploader_defaults(doctype: str):
@@ -120,8 +142,8 @@ def get_file_uploader_defaults(doctype: str):
 		make_attachments_public = meta.get("make_attachments_public")
 
 	return {
-		'allowed_file_types': frappe.get_system_settings("allowed_file_extensions"),
+		"allowed_file_types": frappe.get_system_settings("allowed_file_extensions"),
-		'max_file_size': get_max_file_size(),
+		"max_file_size": get_max_file_size(),
-		'max_number_of_files': max_number_of_files,
+		"max_number_of_files": max_number_of_files,
-		'make_attachments_public': bool(make_attachments_public),
+		"make_attachments_public": bool(make_attachments_public),
-	}
+	}

crm/api/activities.py

@@ -1,10 +1,13 @@
 import json
 
-from bs4 import BeautifulSoup
 import frappe
+from bs4 import BeautifulSoup
 from frappe import _
-from frappe.utils.caching import redis_cache
 from frappe.desk.form.load import get_docinfo
+from frappe.query_builder import JoinType
+
+from crm.fcrm.doctype.crm_call_log.crm_call_log import parse_call_log
+
 
 @frappe.whitelist()
 def get_activities(name):
@@ -15,11 +18,14 @@ def get_activities(name):
 	else:
 		frappe.throw(_("Document not found"), frappe.DoesNotExistError)
 
+
 def get_deal_activities(name):
-	get_docinfo('', "CRM Deal", name)
+	get_docinfo("", "CRM Deal", name)
 	docinfo = frappe.response["docinfo"]
 	deal_meta = frappe.get_meta("CRM Deal")
-	deal_fields = {field.fieldname: {"label": field.label, "options": field.options} for field in deal_meta.fields}
+	deal_fields = {
+		field.fieldname: {"label": field.label, "options": field.options} for field in deal_meta.fields
+	}
 	avoid_fields = [
 		"lead",
 		"response_by",
@@ -43,13 +49,15 @@ def get_deal_activities(name):
 		activities, calls, notes, tasks, attachments = get_lead_activities(lead)
 		creation_text = "converted the lead to this deal"
 
-	activities.append({
+	activities.append(
-		"activity_type": "creation",
+		{
-		"creation": doc[0],
+			"activity_type": "creation",
-		"owner": doc[1],
+			"creation": doc[0],
-		"data": creation_text,
+			"owner": doc[1],
-		"is_lead": False,
+			"data": creation_text,
-	})
+			"is_lead": False,
+		}
+	)
 
 	docinfo.versions.reverse()
 
@@ -107,7 +115,7 @@ def get_deal_activities(name):
 			"creation": comment.creation,
 			"owner": comment.owner,
 			"content": comment.content,
-			"attachments": get_attachments('Comment', comment.name),
+			"attachments": get_attachments("Comment", comment.name),
 			"is_lead": False,
 		}
 		activities.append(activity)
@@ -116,6 +124,7 @@ def get_deal_activities(name):
 		activity = {
 			"activity_type": "communication",
 			"communication_type": communication.communication_type,
+			"communication_date": communication.communication_date or communication.creation,
 			"creation": communication.creation,
 			"data": {
 				"subject": communication.subject,
@@ -125,7 +134,7 @@ def get_deal_activities(name):
 				"recipients": communication.recipients,
 				"cc": communication.cc,
 				"bcc": communication.bcc,
-				"attachments": get_attachments('Communication', communication.name),
+				"attachments": get_attachments("Communication", communication.name),
 				"read_by_recipient": communication.read_by_recipient,
 				"delivery_status": communication.delivery_status,
 			},
@@ -144,21 +153,24 @@ def get_deal_activities(name):
 		}
 		activities.append(activity)
 
-	calls = calls + get_linked_calls(name)
+	calls = calls + get_linked_calls(name).get("calls", [])
-	notes = notes + get_linked_notes(name)
+	notes = notes + get_linked_notes(name) + get_linked_calls(name).get("notes", [])
-	tasks = tasks + get_linked_tasks(name)
+	tasks = tasks + get_linked_tasks(name) + get_linked_calls(name).get("tasks", [])
-	attachments = attachments + get_attachments('CRM Deal', name)
+	attachments = attachments + get_attachments("CRM Deal", name)
 
 	activities.sort(key=lambda x: x["creation"], reverse=True)
 	activities = handle_multiple_versions(activities)
 
 	return activities, calls, notes, tasks, attachments
 
+
 def get_lead_activities(name):
-	get_docinfo('', "CRM Lead", name)
+	get_docinfo("", "CRM Lead", name)
 	docinfo = frappe.response["docinfo"]
 	lead_meta = frappe.get_meta("CRM Lead")
-	lead_fields = {field.fieldname: {"label": field.label, "options": field.options} for field in lead_meta.fields}
+	lead_fields = {
+		field.fieldname: {"label": field.label, "options": field.options} for field in lead_meta.fields
+	}
 	avoid_fields = [
 		"converted",
 		"response_by",
@@ -169,13 +181,15 @@ def get_lead_activities(name):
 	]
 
 	doc = frappe.db.get_values("CRM Lead", name, ["creation", "owner"])[0]
-	activities = [{
+	activities = [
-		"activity_type": "creation",
+		{
-		"creation": doc[0],
+			"activity_type": "creation",
-		"owner": doc[1],
+			"creation": doc[0],
-		"data": "created this lead",
+			"owner": doc[1],
-		"is_lead": True,
+			"data": "created this lead",
-	}]
+			"is_lead": True,
+		}
+	]
 
 	docinfo.versions.reverse()
 
@@ -233,7 +247,7 @@ def get_lead_activities(name):
 			"creation": comment.creation,
 			"owner": comment.owner,
 			"content": comment.content,
-			"attachments": get_attachments('Comment', comment.name),
+			"attachments": get_attachments("Comment", comment.name),
 			"is_lead": True,
 		}
 		activities.append(activity)
@@ -242,6 +256,7 @@ def get_lead_activities(name):
 		activity = {
 			"activity_type": "communication",
 			"communication_type": communication.communication_type,
+			"communication_date": communication.communication_date or communication.creation,
 			"creation": communication.creation,
 			"data": {
 				"subject": communication.subject,
@@ -251,7 +266,7 @@ def get_lead_activities(name):
 				"recipients": communication.recipients,
 				"cc": communication.cc,
 				"bcc": communication.bcc,
-				"attachments": get_attachments('Communication', communication.name),
+				"attachments": get_attachments("Communication", communication.name),
 				"read_by_recipient": communication.read_by_recipient,
 				"delivery_status": communication.delivery_status,
 			},
@@ -270,10 +285,10 @@ def get_lead_activities(name):
 		}
 		activities.append(activity)
 
-	calls = get_linked_calls(name)
+	calls = get_linked_calls(name).get("calls", [])
-	notes = get_linked_notes(name)
+	notes = get_linked_notes(name) + get_linked_calls(name).get("notes", [])
-	tasks = get_linked_tasks(name)
+	tasks = get_linked_tasks(name) + get_linked_calls(name).get("tasks", [])
-	attachments = get_attachments('CRM Lead', name)
+	attachments = get_attachments("CRM Lead", name)
 
 	activities.sort(key=lambda x: x["creation"], reverse=True)
 	activities = handle_multiple_versions(activities)
@@ -282,11 +297,25 @@ def get_lead_activities(name):
 
 
 def get_attachments(doctype, name):
-	return frappe.db.get_all(
+	return (
-		"File",
+		frappe.db.get_all(
-		filters={"attached_to_doctype": doctype, "attached_to_name": name},
+			"File",
-		fields=["name", "file_name", "file_type", "file_url", "file_size", "is_private", "creation", "owner"],
+			filters={"attached_to_doctype": doctype, "attached_to_name": name},
-	) or []
+			fields=[
+				"name",
+				"file_name",
+				"file_type",
+				"file_url",
+				"file_size",
+				"is_private",
+				"modified",
+				"creation",
+				"owner",
+			],
+		)
+		or []
+	)
+
 
 def handle_multiple_versions(versions):
 	activities = []
@@ -298,7 +327,8 @@ def handle_multiple_versions(versions):
 			activities.append(version)
 		if not old_version:
 			old_version = version
-			if is_version: grouped_versions.append(version)
+			if is_version:
+				grouped_versions.append(version)
 			continue
 		if is_version and old_version.get("owner") and version["owner"] == old_version["owner"]:
 			grouped_versions.append(version)
@@ -306,13 +336,15 @@ def handle_multiple_versions(versions):
 			if grouped_versions:
 				activities.append(parse_grouped_versions(grouped_versions))
 			grouped_versions = []
-			if is_version: grouped_versions.append(version)
+			if is_version:
+				grouped_versions.append(version)
 		old_version = version
 		if version == versions[-1] and grouped_versions:
 			activities.append(parse_grouped_versions(grouped_versions))
 
 	return activities
 
+
 def parse_grouped_versions(versions):
 	version = versions[0]
 	if len(versions) == 1:
@@ -321,6 +353,7 @@ def parse_grouped_versions(versions):
 	version["other_versions"] = other_versions
 	return version
 
+
 def get_linked_calls(name):
 	calls = frappe.db.get_all(
 		"CRM Call Log",
@@ -341,16 +374,89 @@ def get_linked_calls(name):
 			"note",
 		],
 	)
-	return calls or []
+
+	linked_calls = frappe.db.get_all(
+		"Dynamic Link", filters={"link_name": name, "parenttype": "CRM Call Log"}, pluck="parent"
+	)
+
+	notes = []
+	tasks = []
+
+	if linked_calls:
+		CallLog = frappe.qb.DocType("CRM Call Log")
+		Link = frappe.qb.DocType("Dynamic Link")
+		query = (
+			frappe.qb.from_(CallLog)
+			.select(
+				CallLog.name,
+				CallLog.caller,
+				CallLog.receiver,
+				CallLog["from"],
+				CallLog.to,
+				CallLog.duration,
+				CallLog.start_time,
+				CallLog.end_time,
+				CallLog.status,
+				CallLog.type,
+				CallLog.recording_url,
+				CallLog.creation,
+				CallLog.note,
+				Link.link_doctype,
+				Link.link_name,
+			)
+			.join(Link, JoinType.inner)
+			.on(Link.parent == CallLog.name)
+			.where(CallLog.name.isin(linked_calls))
+		)
+		_calls = query.run(as_dict=True)
+
+		for call in _calls:
+			if call.get("link_doctype") == "FCRM Note":
+				notes.append(call.link_name)
+			elif call.get("link_doctype") == "CRM Task":
+				tasks.append(call.link_name)
+
+		_calls = [call for call in _calls if call.get("link_doctype") not in ["FCRM Note", "CRM Task"]]
+		if _calls:
+			calls = calls + _calls
+
+	if notes:
+		notes = frappe.db.get_all(
+			"FCRM Note",
+			filters={"name": ("in", notes)},
+			fields=["name", "title", "content", "owner", "modified"],
+		)
+
+	if tasks:
+		tasks = frappe.db.get_all(
+			"CRM Task",
+			filters={"name": ("in", tasks)},
+			fields=[
+				"name",
+				"title",
+				"description",
+				"assigned_to",
+				"due_date",
+				"priority",
+				"status",
+				"modified",
+			],
+		)
+
+	calls = [parse_call_log(call) for call in calls] if calls else []
+
+	return {"calls": calls, "notes": notes, "tasks": tasks}
+
 
 def get_linked_notes(name):
 	notes = frappe.db.get_all(
 		"FCRM Note",
 		filters={"reference_docname": name},
-		fields=['name', 'title', 'content', 'owner', 'modified'],
+		fields=["name", "title", "content", "owner", "modified"],
 	)
 	return notes or []
 
+
 def get_linked_tasks(name):
 	tasks = frappe.db.get_all(
 		"CRM Task",
@@ -360,7 +466,6 @@ def get_linked_tasks(name):
 			"title",
 			"description",
 			"assigned_to",
-			"assigned_to",
 			"due_date",
 			"priority",
 			"status",
@@ -369,6 +474,7 @@ def get_linked_tasks(name):
 	)
 	return tasks or []
 
+
 def parse_attachment_log(html, type):
 	soup = BeautifulSoup(html, "html.parser")
 	a_tag = soup.find("a")
@@ -390,4 +496,4 @@ def parse_attachment_log(html, type):
 		"file_name": a_tag.text,
 		"file_url": a_tag["href"],
 		"is_private": is_private,
-	}
+	}

crm/api/assignment_rule.py

@@ -0,0 +1,32 @@
+import frappe
+
+
+@frappe.whitelist()
+def get_assignment_rules_list():
+	assignment_rules = []
+	for docname in frappe.get_all(
+		"Assignment Rule", filters={"document_type": ["in", ["CRM Lead", "CRM Deal"]]}
+	):
+		doc = frappe.get_value(
+			"Assignment Rule",
+			docname,
+			fieldname=[
+				"name",
+				"description",
+				"disabled",
+				"priority",
+			],
+			as_dict=True,
+		)
+		users_exists = bool(frappe.db.exists("Assignment Rule User", {"parent": docname.name}))
+		assignment_rules.append({**doc, "users_exists": users_exists})
+	return assignment_rules
+
+
+@frappe.whitelist()
+def duplicate_assignment_rule(docname, new_name):
+	doc = frappe.get_doc("Assignment Rule", docname)
+	doc.name = new_name
+	doc.assignment_rule_name = new_name
+	doc.insert()
+	return doc

crm/api/contact.py

@@ -3,29 +3,9 @@ from frappe import _
 
 
 def validate(doc, method):
-	set_primary_email(doc)
-	set_primary_mobile_no(doc)
-	doc.set_primary_email()
-	doc.set_primary("mobile_no")
 	update_deals_email_mobile_no(doc)
 
 
-def set_primary_email(doc):
-	if not doc.email_ids:
-		return
-
-	if len(doc.email_ids) == 1:
-		doc.email_ids[0].is_primary = 1
-
-
-def set_primary_mobile_no(doc):
-	if not doc.phone_nos:
-		return
-
-	if len(doc.phone_nos) == 1:
-		doc.phone_nos[0].is_primary_mobile_no = 1
-
-
 def update_deals_email_mobile_no(doc):
 	linked_deals = frappe.get_all(
 		"CRM Contacts",
@@ -34,38 +14,18 @@ def update_deals_email_mobile_no(doc):
 	)
 
 	for linked_deal in linked_deals:
-		deal = frappe.get_cached_doc("CRM Deal", linked_deal.parent)
+		deal = frappe.db.get_values("CRM Deal", linked_deal.parent, ["email", "mobile_no"], as_dict=True)[0]
 		if deal.email != doc.email_id or deal.mobile_no != doc.mobile_no:
-			deal.email = doc.email_id
+			frappe.db.set_value(
-			deal.mobile_no = doc.mobile_no
+				"CRM Deal",
-			deal.save(ignore_permissions=True)
+				linked_deal.parent,
+				{
+					"email": doc.email_id,
+					"mobile_no": doc.mobile_no,
+				},
+			)
 
 
-@frappe.whitelist()
-def get_contact(name):
-	Contact = frappe.qb.DocType("Contact")
-
-	query = (
-		frappe.qb.from_(Contact)
-		.select("*")
-		.where(Contact.name == name)
-		.limit(1)
-	)
-
-	contact = query.run(as_dict=True)
-	if not len(contact):
-		frappe.throw(_("Contact not found"), frappe.DoesNotExistError)
-	contact = contact.pop()
-
-	contact["doctype"] = "Contact"
-	contact["email_ids"] = frappe.get_all(
-		"Contact Email", filters={"parent": name}, fields=["name", "email_id", "is_primary"]
-	)
-	contact["phone_nos"] = frappe.get_all(
-		"Contact Phone", filters={"parent": name}, fields=["name", "phone", "is_primary_mobile_no"]
-	)
-	return contact
-
 @frappe.whitelist()
 def get_linked_deals(contact):
 	"""Get linked deals for a contact"""
@@ -109,12 +69,14 @@ def create_new(contact, field, value):
 	if not frappe.has_permission("Contact", "write", contact):
 		frappe.throw("Not permitted", frappe.PermissionError)
 
-	contact = frappe.get_doc("Contact", contact)
+	contact = frappe.get_cached_doc("Contact", contact)
 
 	if field == "email":
-		contact.append("email_ids", {"email_id": value})
+		email = {"email_id": value, "is_primary": 1 if len(contact.email_ids) == 0 else 0}
+		contact.append("email_ids", email)
 	elif field in ("mobile_no", "phone"):
-		contact.append("phone_nos", {"phone": value})
+		mobile_no = {"phone": value, "is_primary_mobile_no": 1 if len(contact.phone_nos) == 0 else 0}
+		contact.append("phone_nos", mobile_no)
 	else:
 		frappe.throw("Invalid field")
 
@@ -174,10 +136,10 @@ def search_emails(txt: str):
 		or_filters=or_filters,
 		limit_start=0,
 		limit_page_length=20,
-		order_by='email_id, full_name, name',
+		order_by="email_id, full_name, name",
 		ignore_permissions=False,
 		as_list=True,
 		strict=False,
 	)
 
-	return results
+	return results

crm/api/demo.py

@@ -15,12 +15,10 @@ def login():
 	frappe.local.response["location"] = frappe.local.response["redirect_to"]
 
 
-def validate_reset_password(user):
+def validate_reset_password(doc, event):
 	if frappe.conf.demo_username and frappe.session.user == frappe.conf.demo_username:
 		frappe.throw(
-			_("Password cannot be reset by Demo User {}").format(
+			_("Password cannot be reset by Demo User {}").format(frappe.bold(frappe.conf.demo_username)),
-				frappe.bold(frappe.conf.demo_username)
-			),
 			frappe.PermissionError,
 		)
 
@@ -28,9 +26,6 @@ def validate_reset_password(user):
 def validate_user(doc, event):
 	if frappe.conf.demo_username and frappe.session.user == frappe.conf.demo_username and doc.new_password:
 		frappe.throw(
-			_("Password cannot be reset by Demo User {}").format(
+			_("Password cannot be reset by Demo User {}").format(frappe.bold(frappe.conf.demo_username)),
-				frappe.bold(frappe.conf.demo_username)
-			),
 			frappe.PermissionError,
 		)
-

crm/api/doc.py

@@ -2,6 +2,8 @@ import json
 
 import frappe
 from frappe import _
+from frappe.custom.doctype.property_setter.property_setter import make_property_setter
+from frappe.desk.form.assign_to import set_status
 from frappe.model import no_value_fields
 from frappe.model.document import get_controller
 from frappe.utils import make_filter_tuple
@@ -9,6 +11,7 @@ from pypika import Criterion
 
 from crm.api.views import get_views
 from crm.fcrm.doctype.crm_form_script.crm_form_script import get_form_script
+from crm.utils import get_dynamic_linked_docs, get_linked_docs
 
 
 @frappe.whitelist()
@@ -19,21 +22,23 @@ def sort_options(doctype: str):
 		{
 			"label": _(field.label),
 			"value": field.fieldname,
+			"fieldname": field.fieldname,
 		}
 		for field in fields
 		if field.label and field.fieldname
 	]
 
 	standard_fields = [
-		{"label": "Name", "value": "name"},
+		{"label": "Name", "fieldname": "name"},
-		{"label": "Created On", "value": "creation"},
+		{"label": "Created On", "fieldname": "creation"},
-		{"label": "Last Modified", "value": "modified"},
+		{"label": "Last Modified", "fieldname": "modified"},
-		{"label": "Modified By", "value": "modified_by"},
+		{"label": "Modified By", "fieldname": "modified_by"},
-		{"label": "Owner", "value": "owner"},
+		{"label": "Owner", "fieldname": "owner"},
 	]
 
 	for field in standard_fields:
 		field["label"] = _(field["label"])
+		field["value"] = field["fieldname"]
 		fields.append(field)
 
 	return fields
@@ -100,6 +105,7 @@ def get_filterable_fields(doctype: str):
 
 	for field in res:
 		field["label"] = _(field.get("label"))
+		field["value"] = field.get("fieldname")
 
 	return res
 
@@ -129,23 +135,23 @@ def get_group_by_fields(doctype: str):
 	fields = [
 		{
 			"label": _(field.label),
-			"value": field.fieldname,
+			"fieldname": field.fieldname,
 		}
 		for field in fields
 		if field.label and field.fieldname
 	]
 
 	standard_fields = [
-		{"label": "Name", "value": "name"},
+		{"label": "Name", "fieldname": "name"},
-		{"label": "Created On", "value": "creation"},
+		{"label": "Created On", "fieldname": "creation"},
-		{"label": "Last Modified", "value": "modified"},
+		{"label": "Last Modified", "fieldname": "modified"},
-		{"label": "Modified By", "value": "modified_by"},
+		{"label": "Modified By", "fieldname": "modified_by"},
-		{"label": "Owner", "value": "owner"},
+		{"label": "Owner", "fieldname": "owner"},
-		{"label": "Liked By", "value": "_liked_by"},
+		{"label": "Liked By", "fieldname": "_liked_by"},
-		{"label": "Assigned To", "value": "_assign"},
+		{"label": "Assigned To", "fieldname": "_assign"},
-		{"label": "Comments", "value": "_comments"},
+		{"label": "Comments", "fieldname": "_comments"},
-		{"label": "Created On", "value": "creation"},
+		{"label": "Created On", "fieldname": "creation"},
-		{"label": "Modified On", "value": "modified"},
+		{"label": "Modified On", "fieldname": "modified"},
 	]
 
 	for field in standard_fields:
@@ -167,7 +173,7 @@ def get_doctype_fields_meta(DocField, doctype, allowed_fieldtypes, restricted_fi
 			DocField.options,
 		)
 		.where(DocField[parent] == doctype)
-		.where(DocField.hidden == False)
+		.where(DocField.hidden == False)  # noqa: E712
 		.where(Criterion.any([DocField.fieldtype == i for i in allowed_fieldtypes]))
 		.where(Criterion.all([DocField.fieldname != i for i in restricted_fields]))
 		.run(as_dict=True)
@@ -175,31 +181,98 @@ def get_doctype_fields_meta(DocField, doctype, allowed_fieldtypes, restricted_fi
 
 
 @frappe.whitelist()
-def get_quick_filters(doctype: str):
+def get_quick_filters(doctype: str, cached: bool = True):
-	meta = frappe.get_meta(doctype)
+	meta = frappe.get_meta(doctype, cached)
-	fields = [field for field in meta.fields if field.in_standard_filter]
 	quick_filters = []
 
+	if global_settings := frappe.db.exists("CRM Global Settings", {"dt": doctype, "type": "Quick Filters"}):
+		_quick_filters = frappe.db.get_value("CRM Global Settings", global_settings, "json")
+		_quick_filters = json.loads(_quick_filters) or []
+
+		fields = []
+
+		for filter in _quick_filters:
+			if filter == "name":
+				fields.append({"label": "Name", "fieldname": "name", "fieldtype": "Data"})
+			else:
+				field = next((f for f in meta.fields if f.fieldname == filter), None)
+				if field:
+					fields.append(field)
+
+	else:
+		fields = [field for field in meta.fields if field.in_standard_filter]
+
 	for field in fields:
-		if field.fieldtype == "Select":
+		options = field.get("options")
-			field.options = field.options.split("\n")
+		if field.get("fieldtype") == "Select" and options and isinstance(options, str):
-			field.options = [{"label": option, "value": option} for option in field.options]
+			options = options.split("\n")
-			field.options.insert(0, {"label": "", "value": ""})
+			options = [{"label": option, "value": option} for option in options]
+			if not any([not option.get("value") for option in options]):
+				options.insert(0, {"label": "", "value": ""})
 		quick_filters.append(
 			{
-				"label": _(field.label),
+				"label": _(field.get("label")),
-				"name": field.fieldname,
+				"fieldname": field.get("fieldname"),
-				"type": field.fieldtype,
+				"fieldtype": field.get("fieldtype"),
-				"options": field.options,
+				"options": options,
 			}
 		)
 
 	if doctype == "CRM Lead":
-		quick_filters = [filter for filter in quick_filters if filter.get("name") != "converted"]
+		quick_filters = [filter for filter in quick_filters if filter.get("fieldname") != "converted"]
 
 	return quick_filters
 
 
+@frappe.whitelist()
+def update_quick_filters(quick_filters: str, old_filters: str, doctype: str):
+	quick_filters = json.loads(quick_filters)
+	old_filters = json.loads(old_filters)
+
+	new_filters = [filter for filter in quick_filters if filter not in old_filters]
+	removed_filters = [filter for filter in old_filters if filter not in quick_filters]
+
+	# update or create global quick filter settings
+	create_update_global_settings(doctype, quick_filters)
+
+	# remove old filters
+	for filter in removed_filters:
+		update_in_standard_filter(filter, doctype, 0)
+
+	# add new filters
+	for filter in new_filters:
+		update_in_standard_filter(filter, doctype, 1)
+
+
+def create_update_global_settings(doctype, quick_filters):
+	if global_settings := frappe.db.exists("CRM Global Settings", {"dt": doctype, "type": "Quick Filters"}):
+		frappe.db.set_value("CRM Global Settings", global_settings, "json", json.dumps(quick_filters))
+	else:
+		# create CRM Global Settings doc
+		doc = frappe.new_doc("CRM Global Settings")
+		doc.dt = doctype
+		doc.type = "Quick Filters"
+		doc.json = json.dumps(quick_filters)
+		doc.insert()
+
+
+def update_in_standard_filter(fieldname, doctype, value):
+	if property_name := frappe.db.exists(
+		"Property Setter",
+		{"doc_type": doctype, "field_name": fieldname, "property": "in_standard_filter"},
+	):
+		frappe.db.set_value("Property Setter", property_name, "value", value)
+	else:
+		make_property_setter(
+			doctype,
+			fieldname,
+			"in_standard_filter",
+			value,
+			"Check",
+			validate_fields_for_doctype=False,
+		)
+
+
 @frappe.whitelist()
 def get_data(
 	doctype: str,
@@ -250,6 +323,8 @@ def get_data(
 	if hasattr(_list, "default_list_data"):
 		default_rows = _list.default_list_data().get("rows")
 
+	meta = frappe.get_meta(doctype)
+
 	if view_type != "kanban":
 		if columns or rows:
 			custom_view = True
@@ -269,7 +344,7 @@ def get_data(
 		default_view_filters = {
 			"dt": doctype,
 			"type": view_type or "list",
-			"is_default": 1,
+			"is_standard": 1,
 			"user": frappe.session.user,
 		}
 
@@ -278,7 +353,7 @@ def get_data(
 			columns = frappe.parse_json(list_view_settings.columns)
 			rows = frappe.parse_json(list_view_settings.rows)
 			is_default = False
-		elif not custom_view or is_default and hasattr(_list, "default_list_data"):
+		elif not custom_view or (is_default and hasattr(_list, "default_list_data")):
 			rows = default_rows
 			columns = _list.default_list_data().get("columns")
 
@@ -291,6 +366,11 @@ def get_data(
 			if column.get("key") == "_liked_by" and column.get("width") == "10rem":
 				column["width"] = "50px"
 
+			# remove column if column.hidden is True
+			column_meta = meta.get_field(column.get("key"))
+			if column_meta and column_meta.get("hidden"):
+				columns.remove(column)
+
 		# check if rows has group_by_field if not add it
 		if group_by_field and group_by_field not in rows:
 			rows.append(group_by_field)
@@ -305,6 +385,7 @@ def get_data(
 			)
 			or []
 		)
+		data = parse_list_data(data, doctype)
 
 	if view_type == "kanban":
 		if not rows:
@@ -341,7 +422,7 @@ def get_data(
 		for kc in kanban_columns:
 			column_filters = {column_field: kc.get("name")}
 			order = kc.get("order")
-			if column_field in filters and filters.get(column_field) != kc.name or kc.get("delete"):
+			if (column_field in filters and filters.get(column_field) != kc.get("name")) or kc.get("delete"):
 				column_data = []
 			else:
 				column_filters.update(filters.copy())
@@ -366,9 +447,11 @@ def get_data(
 				new_filters = filters.copy()
 				new_filters.update({column_field: kc.get("name")})
 
-				all_count = len(
+				all_count = frappe.get_list(
-					frappe.get_list(doctype, filters=convert_filter_to_tuple(doctype, new_filters))
+					doctype,
-				)
+					filters=convert_filter_to_tuple(doctype, new_filters),
+					fields="count(*) as total_count",
+				)[0].total_count
 
 				kc["all_count"] = all_count
 				kc["count"] = len(column_data)
@@ -389,8 +472,8 @@ def get_data(
 	fields = [
 		{
 			"label": _(field.label),
-			"type": field.fieldtype,
+			"fieldtype": field.fieldtype,
-			"value": field.fieldname,
+			"fieldname": field.fieldname,
 			"options": field.options,
 		}
 		for field in fields
@@ -398,23 +481,23 @@ def get_data(
 	]
 
 	std_fields = [
-		{"label": "Name", "type": "Data", "value": "name"},
+		{"label": "Name", "fieldtype": "Data", "fieldname": "name"},
-		{"label": "Created On", "type": "Datetime", "value": "creation"},
+		{"label": "Created On", "fieldtype": "Datetime", "fieldname": "creation"},
-		{"label": "Last Modified", "type": "Datetime", "value": "modified"},
+		{"label": "Last Modified", "fieldtype": "Datetime", "fieldname": "modified"},
 		{
 			"label": "Modified By",
-			"type": "Link",
+			"fieldtype": "Link",
-			"value": "modified_by",
+			"fieldname": "modified_by",
 			"options": "User",
 		},
-		{"label": "Assigned To", "type": "Text", "value": "_assign"},
+		{"label": "Assigned To", "fieldtype": "Text", "fieldname": "_assign"},
-		{"label": "Owner", "type": "Link", "value": "owner", "options": "User"},
+		{"label": "Owner", "fieldtype": "Link", "fieldname": "owner", "options": "User"},
-		{"label": "Like", "type": "Data", "value": "_liked_by"},
+		{"label": "Like", "fieldtype": "Data", "fieldname": "_liked_by"},
 	]
 
 	for field in std_fields:
-		if field.get("value") not in rows:
+		if field.get("fieldname") not in rows:
-			rows.append(field.get("value"))
+			rows.append(field.get("fieldname"))
 		if field not in fields:
 			field["label"] = _(field["label"])
 			fields.append(field)
@@ -448,12 +531,12 @@ def get_data(
 				return options
 
 		for field in fields:
-			if field.get("value") == group_by_field:
+			if field.get("fieldname") == group_by_field:
 				group_by_field = {
 					"label": field.get("label"),
-					"name": field.get("value"),
+					"fieldname": field.get("fieldname"),
-					"type": field.get("type"),
+					"fieldtype": field.get("fieldtype"),
-					"options": get_options(field.get("type"), field.get("options")),
+					"options": get_options(field.get("fieldtype"), field.get("options")),
 				}
 
 	return {
@@ -470,7 +553,9 @@ def get_data(
 		"page_length_count": page_length_count,
 		"is_default": is_default,
 		"views": get_views(doctype),
-		"total_count": len(frappe.get_list(doctype, filters=filters)),
+		"total_count": frappe.get_list(doctype, filters=filters, fields="count(*) as total_count")[
+			0
+		].total_count,
 		"row_count": len(data),
 		"form_script": get_form_script(doctype),
 		"list_script": get_form_script(doctype, "List"),
@@ -478,6 +563,13 @@ def get_data(
 	}
 
 
+def parse_list_data(data, doctype):
+	_list = get_controller(doctype)
+	if hasattr(_list, "parse_list_data"):
+		data = _list.parse_list_data(data)
+	return data
+
+
 def convert_filter_to_tuple(doctype, filters):
 	if isinstance(filters, dict):
 		filters_items = filters.items()
@@ -517,7 +609,7 @@ def get_records_based_on_order(doctype, rows, filters, page_length, order):
 
 
 @frappe.whitelist()
-def get_fields_meta(doctype, restricted_fieldtypes=None, as_array=False):
+def get_fields_meta(doctype, restricted_fieldtypes=None, as_array=False, only_required=False):
 	not_allowed_fieldtypes = [
 		"Tab Break",
 		"Section Break",
@@ -552,6 +644,9 @@ def get_fields_meta(doctype, restricted_fieldtypes=None, as_array=False):
 		if not restricted_fieldtypes or field.get("fieldtype") not in restricted_fieldtypes:
 			fields.append(field)
 
+	if only_required:
+		fields = [field for field in fields if field.get("reqd")]
+
 	if as_array:
 		return fields
 
@@ -565,6 +660,25 @@ def get_fields_meta(doctype, restricted_fieldtypes=None, as_array=False):
 	return fields_meta
 
 
+@frappe.whitelist()
+def remove_assignments(doctype, name, assignees, ignore_permissions=False):
+	assignees = frappe.parse_json(assignees)
+
+	if not assignees:
+		return
+
+	for assign_to in assignees:
+		set_status(
+			doctype,
+			name,
+			todo=None,
+			assign_to=assign_to,
+			status="Cancelled",
+			ignore_permissions=ignore_permissions,
+		)
+
+
+@frappe.whitelist()
 def get_assigned_users(doctype, name, default_assigned_to=None):
 	assigned_users = frappe.get_all(
 		"ToDo",
@@ -632,3 +746,165 @@ def getCounts(d, doctype):
 		"FCRM Note", filters={"reference_doctype": doctype, "reference_docname": d.get("name")}
 	)
 	return d
+
+
+@frappe.whitelist()
+def get_linked_docs_of_document(doctype, docname):
+	try:
+		doc = frappe.get_doc(doctype, docname)
+	except frappe.DoesNotExistError:
+		return []
+
+	linked_docs = get_linked_docs(doc)
+	dynamic_linked_docs = get_dynamic_linked_docs(doc)
+
+	linked_docs.extend(dynamic_linked_docs)
+	linked_docs = list({doc["reference_docname"]: doc for doc in linked_docs}.values())
+
+	docs_data = []
+	for doc in linked_docs:
+		if not doc.get("reference_doctype") or not doc.get("reference_docname"):
+			continue
+
+		try:
+			data = frappe.get_doc(doc["reference_doctype"], doc["reference_docname"])
+		except (frappe.DoesNotExistError, frappe.ValidationError):
+			continue
+
+		title = data.get("title")
+		if data.doctype == "CRM Call Log":
+			title = f"Call from {data.get('from')} to {data.get('to')}"
+
+		if data.doctype == "CRM Deal":
+			title = data.get("organization")
+
+		if data.doctype == "CRM Notification":
+			title = data.get("message")
+
+		docs_data.append(
+			{
+				"doc": data.doctype,
+				"title": title or data.get("name"),
+				"reference_docname": doc["reference_docname"],
+				"reference_doctype": doc["reference_doctype"],
+			}
+		)
+	return docs_data
+
+
+def remove_doc_link(doctype, docname):
+	if not doctype or not docname:
+		return
+
+	try:
+		linked_doc_data = frappe.get_doc(doctype, docname)
+		if doctype == "CRM Notification":
+			delete_notification_type = {
+				"notification_type_doctype": "",
+				"notification_type_doc": "",
+			}
+			delete_references = {
+				"reference_doctype": "",
+				"reference_name": "",
+			}
+			if linked_doc_data.get("notification_type_doctype") == linked_doc_data.get("reference_doctype"):
+				delete_references.update(delete_notification_type)
+
+			linked_doc_data.update(delete_references)
+		else:
+			linked_doc_data.update(
+				{
+					"reference_doctype": "",
+					"reference_docname": "",
+				}
+			)
+		linked_doc_data.save(ignore_permissions=True)
+	except (frappe.DoesNotExistError, frappe.ValidationError):
+		pass
+
+
+def remove_contact_link(doctype, docname):
+	if not doctype or not docname:
+		return
+
+	try:
+		linked_doc_data = frappe.get_doc(doctype, docname)
+		linked_doc_data.update(
+			{
+				"contact": None,
+				"contacts": [],
+			}
+		)
+		linked_doc_data.save(ignore_permissions=True)
+	except (frappe.DoesNotExistError, frappe.ValidationError):
+		pass
+
+
+@frappe.whitelist()
+def remove_linked_doc_reference(items, remove_contact=None, delete=False):
+	if isinstance(items, str):
+		items = frappe.parse_json(items)
+
+	for item in items:
+		if not item.get("doctype") or not item.get("docname"):
+			continue
+
+		try:
+			if remove_contact:
+				remove_contact_link(item["doctype"], item["docname"])
+			else:
+				remove_doc_link(item["doctype"], item["docname"])
+			if delete:
+				frappe.delete_doc(item["doctype"], item["docname"])
+		except (frappe.DoesNotExistError, frappe.ValidationError):
+			# Skip if document doesn't exist or has validation errors
+			continue
+
+	return "success"
+
+
+@frappe.whitelist()
+def delete_bulk_docs(doctype, items, delete_linked=False):
+	from frappe.desk.reportview import delete_bulk
+
+	if not doctype:
+		frappe.throw("Doctype is required")
+
+	if not items:
+		frappe.throw("Items are required")
+
+	items = frappe.parse_json(items)
+	if not isinstance(items, list):
+		frappe.throw("Items must be a list")
+
+	for doc in items:
+		try:
+			if not frappe.db.exists(doctype, doc):
+				frappe.log_error(f"Document {doctype} {doc} does not exist", "Bulk Delete Error")
+				continue
+
+			linked_docs = get_linked_docs_of_document(doctype, doc)
+			for linked_doc in linked_docs:
+				if not linked_doc.get("reference_doctype") or not linked_doc.get("reference_docname"):
+					continue
+
+				remove_linked_doc_reference(
+					[
+						{
+							"doctype": linked_doc["reference_doctype"],
+							"docname": linked_doc["reference_docname"],
+						}
+					],
+					remove_contact=doctype == "Contact",
+					delete=delete_linked,
+				)
+		except Exception as e:
+			frappe.log_error(
+				f"Error processing linked docs for {doctype} {doc}: {str(e)}", "Bulk Delete Error"
+			)
+
+	if len(items) > 10:
+		frappe.enqueue("frappe.desk.reportview.delete_bulk", doctype=doctype, items=items)
+	else:
+		delete_bulk(doctype, items)
+	return "success"

crm/api/onboarding.py

@@ -0,0 +1,24 @@
+import frappe
+
+
+@frappe.whitelist()
+def get_first_lead():
+	lead = frappe.get_all(
+		"CRM Lead",
+		filters={"converted": 0},
+		fields=["name"],
+		order_by="creation",
+		limit=1,
+	)
+	return lead[0].name if lead else None
+
+
+@frappe.whitelist()
+def get_first_deal():
+	deal = frappe.get_all(
+		"CRM Deal",
+		fields=["name"],
+		order_by="creation",
+		limit=1,
+	)
+	return deal[0].name if deal else None

crm/api/session.py

@@ -5,7 +5,16 @@ import frappe
 def get_users():
 	users = frappe.qb.get_query(
 		"User",
-		fields=["name", "email", "enabled", "user_image", "first_name", "last_name", "full_name", "user_type"],
+		fields=[
+			"name",
+			"email",
+			"enabled",
+			"user_image",
+			"first_name",
+			"last_name",
+			"full_name",
+			"user_type",
+		],
 		order_by="full_name asc",
 		distinct=True,
 	).run(as_dict=1)
@@ -14,74 +23,39 @@ def get_users():
 		if frappe.session.user == user.name:
 			user.session_user = True
 
-		user.is_manager = (
+		user.roles = frappe.get_roles(user.name)
-			"Sales Manager" in frappe.get_roles(user.name) or user.name == "Administrator"
-		)
-	return users
 
-@frappe.whitelist()
+		user.role = ""
-def get_contacts():
-	contacts = frappe.get_all(
-		"Contact",
-		fields=[
-			"name",
-			"salutation",
-			"first_name",
-			"last_name",
-			"full_name",
-			"gender",
-			"address",
-			"designation",
-			"image",
-			"email_id",
-			"mobile_no",
-			"phone",
-			"company_name",
-			"modified"
-		],
-		order_by="first_name asc",
-		distinct=True,
-	)
 
-	for contact in contacts:
+		if "System Manager" in user.roles:
-		contact["email_ids"] = frappe.get_all(
+			user.role = "System Manager"
-			"Contact Email",
+		elif "Sales Manager" in user.roles:
-			filters={"parenttype": "Contact", "parent": contact.name},
+			user.role = "Sales Manager"
-			fields=["name", "email_id", "is_primary"],
+		elif "Sales User" in user.roles:
-		)
+			user.role = "Sales User"
+		elif "Guest" in user.roles:
+			user.role = "Guest"
 
-		contact["phone_nos"] = frappe.get_all(
+		if frappe.session.user == user.name:
-			"Contact Phone",
+			user.session_user = True
-			filters={"parenttype": "Contact", "parent": contact.name},
-			fields=["name", "phone", "is_primary_phone", "is_primary_mobile_no"],
-		)
 
-	return contacts
+		user.is_telephony_agent = frappe.db.exists("CRM Telephony Agent", {"user": user.name})
 
-@frappe.whitelist()
+	crm_users = []
-def get_lead_contacts():
+
-	lead_contacts = frappe.get_all(
+	# crm users are users with role Sales User or Sales Manager
-		"CRM Lead",
+	for user in users:
-		fields=[
+		if "Sales User" in user.roles or "Sales Manager" in user.roles:
-			"name",
+			crm_users.append(user)
-			"lead_name",
+
-			"mobile_no",
+	return users, crm_users
-			"phone",
-			"image",
-			"modified"
-		],
-		filters={"converted": 0},
-		order_by="lead_name asc",
-		distinct=True,
-	)
 
-	return lead_contacts
 
 @frappe.whitelist()
 def get_organizations():
 	organizations = frappe.qb.get_query(
 		"CRM Organization",
-		fields=['*'],
+		fields=["*"],
 		order_by="name asc",
 		distinct=True,
 	).run(as_dict=1)

crm/api/settings.py

@@ -0,0 +1,99 @@
+import frappe
+
+
+@frappe.whitelist()
+def create_email_account(data):
+	service = data.get("service")
+	service_config = email_service_config.get(service)
+	if not service_config:
+		return "Service not supported"
+
+	try:
+		email_doc = frappe.get_doc(
+			{
+				"doctype": "Email Account",
+				"email_id": data.get("email_id"),
+				"email_account_name": data.get("email_account_name"),
+				"service": service,
+				"enable_incoming": data.get("enable_incoming"),
+				"enable_outgoing": data.get("enable_outgoing"),
+				"default_incoming": data.get("default_incoming"),
+				"default_outgoing": data.get("default_outgoing"),
+				"email_sync_option": "ALL",
+				"initial_sync_count": 100,
+				"create_contact": 1,
+				"track_email_status": 1,
+				"use_tls": 1,
+				"use_imap": 1,
+				"smtp_port": 587,
+				**service_config,
+			}
+		)
+		if service == "Frappe Mail":
+			email_doc.api_key = data.get("api_key")
+			email_doc.api_secret = data.get("api_secret")
+			email_doc.frappe_mail_site = data.get("frappe_mail_site")
+			email_doc.append_to = "CRM Lead"
+		else:
+			email_doc.append("imap_folder", {"append_to": "CRM Lead", "folder_name": "INBOX"})
+			email_doc.password = data.get("password")
+			# validate whether the credentials are correct
+			email_doc.get_incoming_server()
+
+		# if correct credentials, save the email account
+		email_doc.save()
+	except Exception as e:
+		frappe.throw(str(e))
+
+
+email_service_config = {
+	"Frappe Mail": {
+		"domain": None,
+		"password": None,
+		"awaiting_password": 0,
+		"ascii_encode_password": 0,
+		"login_id_is_different": 0,
+		"login_id": None,
+		"use_imap": 0,
+		"use_ssl": 0,
+		"validate_ssl_certificate": 0,
+		"use_starttls": 0,
+		"email_server": None,
+		"incoming_port": 0,
+		"always_use_account_email_id_as_sender": 1,
+		"use_tls": 0,
+		"use_ssl_for_outgoing": 0,
+		"smtp_server": None,
+		"smtp_port": None,
+		"no_smtp_authentication": 0,
+	},
+	"GMail": {
+		"email_server": "imap.gmail.com",
+		"use_ssl": 1,
+		"smtp_server": "smtp.gmail.com",
+	},
+	"Outlook": {
+		"email_server": "imap-mail.outlook.com",
+		"use_ssl": 1,
+		"smtp_server": "smtp-mail.outlook.com",
+	},
+	"Sendgrid": {
+		"smtp_server": "smtp.sendgrid.net",
+		"smtp_port": 587,
+	},
+	"SparkPost": {
+		"smtp_server": "smtp.sparkpostmail.com",
+	},
+	"Yahoo": {
+		"email_server": "imap.mail.yahoo.com",
+		"use_ssl": 1,
+		"smtp_server": "smtp.mail.yahoo.com",
+		"smtp_port": 587,
+	},
+	"Yandex": {
+		"email_server": "imap.yandex.com",
+		"use_ssl": 1,
+		"smtp_server": "smtp.yandex.com",
+		"smtp_port": 587,
+	},
+}

crm/api/todo.py

@@ -1,90 +1,79 @@
 import frappe
 from frappe import _
+
 from crm.fcrm.doctype.crm_notification.crm_notification import notify_user
 
 
 def after_insert(doc, method):
-    if (
+	if doc.reference_type in ["CRM Lead", "CRM Deal"] and doc.reference_name and doc.allocated_to:
-        doc.reference_type in ["CRM Lead", "CRM Deal"]
+		fieldname = "lead_owner" if doc.reference_type == "CRM Lead" else "deal_owner"
-        and doc.reference_name
+		owner = frappe.db.get_value(doc.reference_type, doc.reference_name, fieldname)
-        and doc.allocated_to
+		if not owner:
-    ):
+			frappe.db.set_value(
-        fieldname = "lead_owner" if doc.reference_type == "CRM Lead" else "deal_owner"
+				doc.reference_type, doc.reference_name, fieldname, doc.allocated_to, update_modified=False
-        lead_owner = frappe.db.get_value(
+			)
-            doc.reference_type, doc.reference_name, fieldname
-        )
-        if not lead_owner:
-            frappe.db.set_value(
-                doc.reference_type, doc.reference_name, fieldname, doc.allocated_to
-            )
 
-    if (
+	if doc.reference_type in ["CRM Lead", "CRM Deal", "CRM Task"] and doc.reference_name and doc.allocated_to:
-        doc.reference_type in ["CRM Lead", "CRM Deal", "CRM Task"]
+		notify_assigned_user(doc)
-        and doc.reference_name
-        and doc.allocated_to
-    ):
-        notify_assigned_user(doc)
 
 
 def on_update(doc, method):
-    if (
+	if (
-        doc.has_value_changed("status")
+		doc.has_value_changed("status")
-        and doc.status == "Cancelled"
+		and doc.status == "Cancelled"
-        and doc.reference_type in ["CRM Lead", "CRM Deal", "CRM Task"]
+		and doc.reference_type in ["CRM Lead", "CRM Deal", "CRM Task"]
-        and doc.reference_name
+		and doc.reference_name
-        and doc.allocated_to
+		and doc.allocated_to
-    ):
+	):
-        notify_assigned_user(doc, is_cancelled=True)
+		notify_assigned_user(doc, is_cancelled=True)
 
 
 def notify_assigned_user(doc, is_cancelled=False):
-    _doc = frappe.get_doc(doc.reference_type, doc.reference_name)
+	_doc = frappe.get_doc(doc.reference_type, doc.reference_name)
-    owner = frappe.get_cached_value("User", frappe.session.user, "full_name")
+	owner = frappe.get_cached_value("User", frappe.session.user, "full_name")
-    notification_text = get_notification_text(owner, doc, _doc, is_cancelled)
+	notification_text = get_notification_text(owner, doc, _doc, is_cancelled)
 
-    message = (
+	message = (
-        _("Your assignment on {0} {1} has been removed by {2}").format(
+		_("Your assignment on {0} {1} has been removed by {2}").format(
-            doc.reference_type, doc.reference_name, owner
+			doc.reference_type, doc.reference_name, owner
-        )
+		)
-        if is_cancelled
+		if is_cancelled
-        else _("{0} assigned a {1} {2} to you").format(
+		else _("{0} assigned a {1} {2} to you").format(owner, doc.reference_type, doc.reference_name)
-            owner, doc.reference_type, doc.reference_name
+	)
-        )
-    )
 
-    redirect_to_doctype, redirect_to_name = get_redirect_to_doc(doc)
+	redirect_to_doctype, redirect_to_name = get_redirect_to_doc(doc)
 
-    notify_user(
+	notify_user(
-        {
+		{
-            "owner": frappe.session.user,
+			"owner": frappe.session.user,
-            "assigned_to": doc.allocated_to,
+			"assigned_to": doc.allocated_to,
-            "notification_type": "Assignment",
+			"notification_type": "Assignment",
-            "message": message,
+			"message": message,
-            "notification_text": notification_text,
+			"notification_text": notification_text,
-            "reference_doctype": doc.reference_type,
+			"reference_doctype": doc.reference_type,
-            "reference_docname": doc.reference_name,
+			"reference_docname": doc.reference_name,
-            "redirect_to_doctype": redirect_to_doctype,
+			"redirect_to_doctype": redirect_to_doctype,
-            "redirect_to_docname": redirect_to_name,
+			"redirect_to_docname": redirect_to_name,
-        }
+		}
-    )
+	)
 
 
 def get_notification_text(owner, doc, reference_doc, is_cancelled=False):
-    name = doc.reference_name
+	name = doc.reference_name
-    doctype = doc.reference_type
+	doctype = doc.reference_type
 
-    if doctype.startswith("CRM "):
+	if doctype.startswith("CRM "):
-        doctype = doctype[4:].lower()
+		doctype = doctype[4:].lower()
 
-    if doctype in ["lead", "deal"]:
+	if doctype in ["lead", "deal"]:
-        name = (
+		name = (
-            reference_doc.lead_name or name
+			reference_doc.lead_name or name
-            if doctype == "lead"
+			if doctype == "lead"
-            else reference_doc.organization or reference_doc.lead_name or name
+			else reference_doc.organization or reference_doc.lead_name or name
-        )
+		)
 
-        if is_cancelled:
+		if is_cancelled:
-            return f"""
+			return f"""
                 <div class="mb-2 leading-5 text-ink-gray-5">
                     <span>{ _('Your assignment on {0} {1} has been removed by {2}').format(
                         doctype,
@@ -94,7 +83,7 @@ def get_notification_text(owner, doc, reference_doc, is_cancelled=False):
                 </div>
             """
 
-        return f"""
+		return f"""
             <div class="mb-2 leading-5 text-ink-gray-5">
                 <span class="font-medium text-ink-gray-9">{ owner }</span>
                 <span>{ _('assigned a {0} {1} to you').format(
@@ -104,9 +93,9 @@ def get_notification_text(owner, doc, reference_doc, is_cancelled=False):
             </div>
         """
 
-    if doctype == "task":
+	if doctype == "task":
-        if is_cancelled:
+		if is_cancelled:
-            return f"""
+			return f"""
                 <div class="mb-2 leading-5 text-ink-gray-5">
                     <span>{ _('Your assignment on task {0} has been removed by {1}').format(
                         f'<span class="font-medium text-ink-gray-9">{ reference_doc.title }</span>',
@@ -114,7 +103,7 @@ def get_notification_text(owner, doc, reference_doc, is_cancelled=False):
                     ) }</span>
                 </div>
             """
-        return f"""
+		return f"""
             <div class="mb-2 leading-5 text-ink-gray-5">
                 <span class="font-medium text-ink-gray-9">{ owner }</span>
                 <span>{ _('assigned a new task {0} to you').format(
@@ -125,8 +114,8 @@ def get_notification_text(owner, doc, reference_doc, is_cancelled=False):
 
 
 def get_redirect_to_doc(doc):
-    if doc.reference_type == "CRM Task":
+	if doc.reference_type == "CRM Task":
-        reference_doc = frappe.get_doc(doc.reference_type, doc.reference_name)
+		reference_doc = frappe.get_doc(doc.reference_type, doc.reference_name)
-        return reference_doc.reference_doctype, reference_doc.reference_docname
+		return reference_doc.reference_doctype, reference_doc.reference_docname
 
-    return doc.reference_type, doc.reference_name
+	return doc.reference_type, doc.reference_name

crm/api/user.py

@@ -0,0 +1,84 @@
+import frappe
+
+
+@frappe.whitelist()
+def add_existing_users(users, role="Sales User"):
+	"""
+	Add existing users to the CRM by assigning them a role (Sales User or Sales Manager).
+	:param users: List of user names to be added
+	"""
+	frappe.only_for(["System Manager", "Sales Manager"])
+	users = frappe.parse_json(users)
+
+	for user in users:
+		add_user(user, role)
+
+
+@frappe.whitelist()
+def update_user_role(user, new_role):
+	"""
+	Update the role of the user to Sales Manager, Sales User, or System Manager.
+	:param user: The name of the user
+	:param new_role: The new role to assign (Sales Manager or Sales User)
+	"""
+
+	frappe.only_for(["System Manager", "Sales Manager"])
+
+	if new_role not in ["System Manager", "Sales Manager", "Sales User"]:
+		frappe.throw("Cannot assign this role")
+
+	user_doc = frappe.get_doc("User", user)
+
+	if new_role == "System Manager":
+		user_doc.append_roles("System Manager", "Sales Manager", "Sales User")
+		user_doc.set("block_modules", [])
+	if new_role == "Sales Manager":
+		user_doc.append_roles("Sales Manager", "Sales User")
+		user_doc.remove_roles("System Manager")
+	if new_role == "Sales User":
+		user_doc.append_roles("Sales User")
+		user_doc.remove_roles("Sales Manager", "System Manager")
+		update_module_in_user(user_doc, "FCRM")
+
+	user_doc.save(ignore_permissions=True)
+
+
+@frappe.whitelist()
+def add_user(user, role):
+	"""
+	Add a user means adding role (Sales User or/and Sales Manager) to the user.
+	:param user: The name of the user to be added
+	:param role: The role to be assigned (Sales User or Sales Manager)
+	"""
+	update_user_role(user, role)
+
+
+@frappe.whitelist()
+def remove_user(user):
+	"""
+	Remove a user means removing Sales User & Sales Manager roles from the user.
+	:param user: The name of the user to be removed
+	"""
+	frappe.only_for(["System Manager", "Sales Manager"])
+
+	user_doc = frappe.get_doc("User", user)
+	roles = [d.role for d in user_doc.roles]
+
+	if "Sales User" in roles:
+		user_doc.remove_roles("Sales User")
+	if "Sales Manager" in roles:
+		user_doc.remove_roles("Sales Manager")
+
+	user_doc.save(ignore_permissions=True)
+	frappe.msgprint(f"User {user} has been removed from CRM roles.")
+
+
+def update_module_in_user(user, module):
+	block_modules = frappe.get_all(
+		"Module Def",
+		fields=["name as module"],
+		filters={"name": ["!=", module]},
+	)
+
+	if block_modules:
+		user.set("block_modules", block_modules)

crm/api/views.py

@@ -8,9 +8,9 @@ def get_views(doctype):
 	query = (
 		frappe.qb.from_(View)
 		.select("*")
-		.where(Criterion.any([View.user == '', View.user == frappe.session.user]))
+		.where(Criterion.any([View.user == "", View.user == frappe.session.user]))
 	)
 	if doctype:
 		query = query.where(View.dt == doctype)
 	views = query.run(as_dict=True)
-	return views
+	return views

crm/api/whatsapp.py

@@ -10,8 +10,15 @@ from crm.fcrm.doctype.crm_notification.crm_notification import notify_user
 def validate(doc, method):
 	if doc.type == "Incoming" and doc.get("from"):
 		name, doctype = get_lead_or_deal_from_number(doc.get("from"))
-		doc.reference_doctype = doctype
+		if name != None:
-		doc.reference_name = name
+			doc.reference_doctype = doctype 
+			doc.reference_name = name
+
+	if doc.type == "Outgoing" and doc.get("to"):
+		name, doctype = get_lead_or_deal_from_number(doc.get("to"))
+		if name != None:
+			doc.reference_doctype = doctype
+			doc.reference_name = name
 
 
 def on_update(doc, method):
@@ -29,7 +36,7 @@ def on_update(doc, method):
 def notify_agent(doc):
 	if doc.type == "Incoming":
 		doctype = doc.reference_doctype
-		if doctype.startswith("CRM "):
+		if doctype and doctype.startswith("CRM "):
 			doctype = doctype[4:].lower()
 		notification_text = f"""
             <div class="mb-2 leading-5 text-ink-gray-5">
@@ -108,7 +115,7 @@ def is_whatsapp_installed():
 def get_whatsapp_messages(reference_doctype, reference_name):
 	# twilio integration app is not compatible with crm app
 	# crm has its own twilio integration in built
-	if "twilio-integration" in frappe.get_installed_apps():
+	if "twilio_integration" in frappe.get_installed_apps():
 		return []
 	if not frappe.db.exists("DocType", "WhatsApp Message"):
 		return []
@@ -335,5 +342,5 @@ def get_from_name(message):
 		else:
 			from_name = doc.get("lead_name")
 	else:
-		from_name = doc.get("first_name") + " " + doc.get("last_name")
+		from_name = " ".join(filter(None, [doc.get("first_name"), doc.get("last_name")]))
 	return from_name

crm/crowdin.yml

@@ -0,0 +1,8 @@
+files:
+  - source: /crm/locale/main.pot
+    translation: /crm/locale/%two_letters_code%.po
+pull_request_title: "chore: sync translations from crowdin"
+pull_request_labels:
+  - translation
+commit_message: "chore: %language% translations"
+append_commit_message: false

crm/fcrm/doctype/crm_call_log/crm_call_log.json

@@ -9,6 +9,8 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "telephony_medium",
+  "section_break_gyqe",
   "id",
   "from",
   "status",
@@ -24,7 +26,9 @@
   "caller",
   "recording_url",
   "end_time",
-  "note"
+  "note",
+  "section_break_kebz",
+  "links"
  ],
  "fields": [
   {
@@ -37,14 +41,15 @@
    "fieldname": "from",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "From"
+   "label": "From",
+   "reqd": 1
   },
   {
    "fieldname": "status",
    "fieldtype": "Select",
    "label": "Status",
    "options": "Initiated\nRinging\nIn Progress\nCompleted\nFailed\nBusy\nNo Answer\nQueued\nCanceled",
-   "read_only": 1
+   "reqd": 1
   },
   {
    "fieldname": "start_time",
@@ -66,20 +71,22 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Type",
-   "options": "Incoming\nOutgoing"
+   "options": "Incoming\nOutgoing",
+   "reqd": 1
   },
   {
    "fieldname": "to",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "To"
+   "label": "To",
+   "reqd": 1
   },
   {
+   "description": "Call duration in seconds",
    "fieldname": "duration",
    "fieldtype": "Duration",
    "in_list_view": 1,
-   "label": "Duration",
+   "label": "Duration"
-   "read_only": 1
   },
   {
    "fieldname": "recording_url",
@@ -123,11 +130,34 @@
    "fieldtype": "Dynamic Link",
    "label": "Reference Name",
    "options": "reference_doctype"
+  },
+  {
+   "fieldname": "section_break_kebz",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "links",
+   "fieldtype": "Table",
+   "label": "Links",
+   "options": "Dynamic Link"
+  },
+  {
+   "fieldname": "telephony_medium",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Telephony Medium",
+   "options": "\nManual\nTwilio\nExotel",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_gyqe",
+   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-03-16 13:23:09.201843",
+ "modified": "2025-04-01 16:01:54.479309",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Call Log",

crm/fcrm/doctype/crm_call_log/crm_call_log.py

@@ -4,96 +4,211 @@
 import frappe
 from frappe.model.document import Document
 
+from crm.integrations.api import get_contact_by_phone_number
+from crm.utils import seconds_to_duration
+
 
 class CRMCallLog(Document):
-		@staticmethod
+	@staticmethod
-		def default_list_data():
+	def default_list_data():
-			columns = [
+		columns = [
-				{
+			{
-					'label': 'From',
+				"label": "Caller",
-					'type': 'Link',
+				"type": "Link",
-					'key': 'caller',
+				"key": "caller",
-					'options': 'User',
+				"options": "User",
-					'width': '9rem',
+				"width": "9rem",
-				},
+			},
-				{
+			{
-					'label': 'To',
+				"label": "Receiver",
-					'type': 'Link',
+				"type": "Link",
-					'key': 'receiver',
+				"key": "receiver",
-					'options': 'User',
+				"options": "User",
-					'width': '9rem',
+				"width": "9rem",
-				},
+			},
-				{
+			{
-					'label': 'Type',
+				"label": "Type",
-					'type': 'Select',
+				"type": "Select",
-					'key': 'type',
+				"key": "type",
-					'width': '9rem',
+				"width": "9rem",
-				},
+			},
-				{
+			{
-					'label': 'Status',
+				"label": "Status",
-					'type': 'Select',
+				"type": "Select",
-					'key': 'status',
+				"key": "status",
-					'width': '9rem',
+				"width": "9rem",
-				},
+			},
-				{
+			{
-					'label': 'Duration',
+				"label": "Duration",
-					'type': 'Duration',
+				"type": "Duration",
-					'key': 'duration',
+				"key": "duration",
-					'width': '6rem',
+				"width": "6rem",
-				},
+			},
-				{
+			{
-					'label': 'From (number)',
+				"label": "From (number)",
-					'type': 'Data',
+				"type": "Data",
-					'key': 'from',
+				"key": "from",
-					'width': '9rem',
+				"width": "9rem",
-				},
+			},
-				{
+			{
-					'label': 'To (number)',
+				"label": "To (number)",
-					'type': 'Data',
+				"type": "Data",
-					'key': 'to',
+				"key": "to",
-					'width': '9rem',
+				"width": "9rem",
-				},
+			},
-				{
+			{
-					'label': 'Created On',
+				"label": "Created On",
-					'type': 'Datetime',
+				"type": "Datetime",
-					'key': 'creation',
+				"key": "creation",
-					'width': '8rem',
+				"width": "8rem",
-				},
+			},
-				]
+		]
-			rows = [
+		rows = [
-				"name",
+			"name",
-				"caller",
+			"caller",
-				"receiver",
+			"receiver",
-				"type",
+			"type",
-				"status",
+			"status",
-				"duration",
+			"duration",
-				"from",
+			"from",
-				"to",
+			"to",
-				"note",
+			"note",
-				"recording_url",
+			"recording_url",
-				"reference_doctype",
+			"reference_doctype",
-				"reference_docname",
+			"reference_docname",
-				"creation",
+			"creation",
-			]
+		]
-			return {'columns': columns, 'rows': rows}
+		return {"columns": columns, "rows": rows}
+
+	def parse_list_data(calls):
+		return [parse_call_log(call) for call in calls] if calls else []
+
+	def has_link(self, doctype, name):
+		for link in self.links:
+			if link.link_doctype == doctype and link.link_name == name:
+				return True
+
+	def link_with_reference_doc(self, reference_doctype, reference_name):
+		if self.has_link(reference_doctype, reference_name):
+			return
+
+		self.append("links", {"link_doctype": reference_doctype, "link_name": reference_name})
+
+
+def parse_call_log(call):
+	call["show_recording"] = False
+	call["_duration"] = seconds_to_duration(call.get("duration"))
+	if call.get("type") == "Incoming":
+		call["activity_type"] = "incoming_call"
+		contact = get_contact_by_phone_number(call.get("from"))
+		receiver = (
+			frappe.db.get_values("User", call.get("receiver"), ["full_name", "user_image"])[0]
+			if call.get("receiver")
+			else [None, None]
+		)
+		call["_caller"] = {
+			"label": contact.get("full_name", "Unknown"),
+			"image": contact.get("image"),
+		}
+		call["_receiver"] = {
+			"label": receiver[0],
+			"image": receiver[1],
+		}
+	elif call.get("type") == "Outgoing":
+		call["activity_type"] = "outgoing_call"
+		contact = get_contact_by_phone_number(call.get("to"))
+		caller = (
+			frappe.db.get_values("User", call.get("caller"), ["full_name", "user_image"])[0]
+			if call.get("caller")
+			else [None, None]
+		)
+		call["_caller"] = {
+			"label": caller[0],
+			"image": caller[1],
+		}
+		call["_receiver"] = {
+			"label": contact.get("full_name", "Unknown"),
+			"image": contact.get("image"),
+		}
+
+	return call
+
 
 @frappe.whitelist()
-def create_lead_from_call_log(call_log):
+def get_call_log(name):
+	call = frappe.get_cached_doc(
+		"CRM Call Log",
+		name,
+		fields=[
+			"name",
+			"caller",
+			"receiver",
+			"duration",
+			"type",
+			"status",
+			"from",
+			"to",
+			"note",
+			"recording_url",
+			"reference_doctype",
+			"reference_docname",
+			"creation",
+		],
+	).as_dict()
+
+	call = parse_call_log(call)
+
+	notes = []
+	tasks = []
+
+	if call.get("note"):
+		note = frappe.get_cached_doc("FCRM Note", call.get("note")).as_dict()
+		notes.append(note)
+
+	if call.get("reference_doctype") and call.get("reference_docname"):
+		if call.get("reference_doctype") == "CRM Lead":
+			call["_lead"] = call.get("reference_docname")
+		elif call.get("reference_doctype") == "CRM Deal":
+			call["_deal"] = call.get("reference_docname")
+
+	if call.get("links"):
+		for link in call.get("links"):
+			if link.get("link_doctype") == "CRM Task":
+				task = frappe.get_cached_doc("CRM Task", link.get("link_name")).as_dict()
+				tasks.append(task)
+			elif link.get("link_doctype") == "FCRM Note":
+				note = frappe.get_cached_doc("FCRM Note", link.get("link_name")).as_dict()
+				notes.append(note)
+			elif link.get("link_doctype") == "CRM Lead":
+				call["_lead"] = link.get("link_name")
+			elif link.get("link_doctype") == "CRM Deal":
+				call["_deal"] = link.get("link_name")
+
+	call["_tasks"] = tasks
+	call["_notes"] = notes
+	return call
+
+
+@frappe.whitelist()
+def create_lead_from_call_log(call_log, lead_details=None):
 	lead = frappe.new_doc("CRM Lead")
-	lead.first_name = "Lead from call " + call_log.get("from")
+	lead_details = frappe.parse_json(lead_details or "{}")
-	lead.mobile_no = call_log.get("from")
+
-	lead.lead_owner = frappe.session.user
+	if not lead_details.get("lead_owner"):
+		lead_details["lead_owner"] = frappe.session.user
+	if not lead_details.get("mobile_no"):
+		lead_details["mobile_no"] = call_log.get("from") or ""
+	if not lead_details.get("first_name"):
+		lead_details["first_name"] = "Lead from call " + (
+			lead_details.get("mobile_no") or call_log.get("name")
+		)
+
+	lead.update(lead_details)
 	lead.save(ignore_permissions=True)
 
-	frappe.db.set_value("CRM Call Log", call_log.get("name"), {
+	# link call log with lead
-		"reference_doctype": "CRM Lead",
+	call_log = frappe.get_doc("CRM Call Log", call_log.get("name"))
-		"reference_docname": lead.name
+	call_log.link_with_reference_doc("CRM Lead", lead.name)
-	})
+	call_log.save(ignore_permissions=True)
 
-	if call_log.get("note"):
+	return lead.name
-		frappe.db.set_value("FCRM Note", call_log.get("note"), {
-			"reference_doctype": "CRM Lead",
-			"reference_docname": lead.name
-		})
-
-	return lead.name

crm/fcrm/doctype/crm_dashboard/crm_dashboard.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 Dashboard", {
+// 	refresh(frm) {
+
+// 	},
+// });

crm/fcrm/doctype/crm_dashboard/crm_dashboard.json

@@ -0,0 +1,105 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:title",
+ "creation": "2025-07-14 12:19:49.725022",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "title",
+  "private",
+  "column_break_exbw",
+  "user",
+  "section_break_hfza",
+  "layout"
+ ],
+ "fields": [
+  {
+   "fieldname": "column_break_exbw",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "section_break_hfza",
+   "fieldtype": "Section Break"
+  },
+  {
+   "default": "[]",
+   "fieldname": "layout",
+   "fieldtype": "Code",
+   "label": "Layout",
+   "options": "JSON"
+  },
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "label": "Name",
+   "unique": 1
+  },
+  {
+   "depends_on": "private",
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "label": "User",
+   "mandatory_depends_on": "private",
+   "options": "User"
+  },
+  {
+   "default": "0",
+   "fieldname": "private",
+   "fieldtype": "Check",
+   "label": "Private"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2025-07-14 12:36:10.831351",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Dashboard",
+ "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
+  }
+ ],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "title"
+}

crm/fcrm/doctype/crm_dashboard/crm_dashboard.py

@@ -0,0 +1,34 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+
+class CRMDashboard(Document):
+	pass
+
+
+def default_manager_dashboard_layout():
+	"""
+	Returns the default layout for the CRM Manager Dashboard.
+	"""
+	return '[{"name":"total_leads","type":"number_chart","tooltip":"Total number of leads","layout":{"x":0,"y":0,"w":4,"h":3,"i":"total_leads"}},{"name":"ongoing_deals","type":"number_chart","tooltip":"Total number of ongoing deals","layout":{"x":8,"y":0,"w":4,"h":3,"i":"ongoing_deals"}},{"name":"won_deals","type":"number_chart","tooltip":"Total number of won deals","layout":{"x":12,"y":0,"w":4,"h":3,"i":"won_deals"}},{"name":"average_won_deal_value","type":"number_chart","tooltip":"Average value of won deals","layout":{"x":16,"y":0,"w":4,"h":3,"i":"average_won_deal_value"}},{"name":"average_deal_value","type":"number_chart","tooltip":"Average deal value of ongoing and won deals","layout":{"x":0,"y":2,"w":4,"h":3,"i":"average_deal_value"}},{"name":"average_time_to_close_a_lead","type":"number_chart","tooltip":"Average time taken to close a lead","layout":{"x":4,"y":0,"w":4,"h":3,"i":"average_time_to_close_a_lead"}},{"name":"average_time_to_close_a_deal","type":"number_chart","layout":{"x":4,"y":2,"w":4,"h":3,"i":"average_time_to_close_a_deal"}},{"name":"spacer","type":"spacer","layout":{"x":8,"y":2,"w":12,"h":3,"i":"spacer"}},{"name":"sales_trend","type":"axis_chart","layout":{"x":0,"y":4,"w":10,"h":9,"i":"sales_trend"}},{"name":"forecasted_revenue","type":"axis_chart","layout":{"x":10,"y":4,"w":10,"h":9,"i":"forecasted_revenue"}},{"name":"funnel_conversion","type":"axis_chart","layout":{"x":0,"y":11,"w":10,"h":9,"i":"funnel_conversion"}},{"name":"deals_by_stage_donut","type":"donut_chart","layout":{"x":10,"y":11,"w":10,"h":9,"i":"deals_by_stage_donut"}},{"name":"lost_deal_reasons","type":"axis_chart","layout":{"x":0,"y":32,"w":20,"h":9,"i":"lost_deal_reasons"}},{"name":"leads_by_source","type":"donut_chart","layout":{"x":0,"y":18,"w":10,"h":9,"i":"leads_by_source"}},{"name":"deals_by_source","type":"donut_chart","layout":{"x":10,"y":18,"w":10,"h":9,"i":"deals_by_source"}},{"name":"deals_by_territory","type":"axis_chart","layout":{"x":0,"y":25,"w":10,"h":9,"i":"deals_by_territory"}},{"name":"deals_by_salesperson","type":"axis_chart","layout":{"x":10,"y":25,"w":10,"h":9,"i":"deals_by_salesperson"}}]'
+
+
+def create_default_manager_dashboard(force=False):
+	"""
+	Creates the default CRM Manager Dashboard if it does not exist.
+	"""
+	if not frappe.db.exists("CRM Dashboard", "Manager Dashboard"):
+		doc = frappe.new_doc("CRM Dashboard")
+		doc.title = "Manager Dashboard"
+		doc.layout = default_manager_dashboard_layout()
+		doc.insert(ignore_permissions=True)
+	else:
+		doc = frappe.get_doc("CRM Dashboard", "Manager Dashboard")
+		if force:
+			doc.layout = default_manager_dashboard_layout()
+			doc.save(ignore_permissions=True)
+	return doc.layout

crm/fcrm/doctype/crm_dashboard/test_crm_dashboard.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 UnitTestCRMDashboard(UnitTestCase):
+	"""
+	Unit tests for CRMDashboard.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class IntegrationTestCRMDashboard(IntegrationTestCase):
+	"""
+	Integration tests for CRMDashboard.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass

crm/fcrm/doctype/crm_deal/api.py

@@ -1,18 +1,5 @@
 import frappe
 
-from crm.api.doc import get_assigned_users, get_fields_meta
-from crm.fcrm.doctype.crm_form_script.crm_form_script import get_form_script
-
-
-@frappe.whitelist()
-def get_deal(name):
-	deal = frappe.get_doc("CRM Deal", name).as_dict()
-
-	deal["fields_meta"] = get_fields_meta("CRM Deal")
-	deal["_form_script"] = get_form_script("CRM Deal")
-	deal["_assign"] = get_assigned_users("CRM Deal", deal.name)
-	return deal
-
 
 @frappe.whitelist()
 def get_deal_contacts(name):
@@ -20,30 +7,22 @@ def get_deal_contacts(name):
 		"CRM Contacts",
 		filters={"parenttype": "CRM Deal", "parent": name},
 		fields=["contact", "is_primary"],
+		distinct=True,
 	)
 	deal_contacts = []
 	for contact in contacts:
+		if not contact.contact:
+			continue
+
 		is_primary = contact.is_primary
 		contact = frappe.get_doc("Contact", contact.contact).as_dict()
 
-		def get_primary_email(contact):
-			for email in contact.email_ids:
-				if email.is_primary:
-					return email.email_id
-			return contact.email_ids[0].email_id if contact.email_ids else ""
-
-		def get_primary_mobile_no(contact):
-			for phone in contact.phone_nos:
-				if phone.is_primary:
-					return phone.phone
-			return contact.phone_nos[0].phone if contact.phone_nos else ""
-
 		_contact = {
 			"name": contact.name,
 			"image": contact.image,
 			"full_name": contact.full_name,
-			"email": get_primary_email(contact),
+			"email": contact.email_id,
-			"mobile_no": get_primary_mobile_no(contact),
+			"mobile_no": contact.mobile_no,
 			"is_primary": is_primary,
 		}
 		deal_contacts.append(_contact)

crm/fcrm/doctype/crm_deal/crm_deal.js

@@ -5,4 +5,68 @@ frappe.ui.form.on("CRM Deal", {
 	refresh(frm) {
 		frm.add_web_link(`/crm/deals/${frm.doc.name}`, __("Open in Portal"));
 	},
+	update_total: function (frm) {
+		let total = 0;
+		let total_qty = 0;
+		let net_total = 0;
+		frm.doc.products.forEach((d) => {
+			total += d.amount;
+			total_qty += d.qty;
+			net_total += d.net_amount;
+		});
+
+		frappe.model.set_value(frm.doctype, frm.docname, "total", total);
+		frappe.model.set_value(
+			frm.doctype,
+			frm.docname,
+			"net_total",
+			net_total || total
+		);
+	}
+});
+
+frappe.ui.form.on("CRM Products", {
+	products_add: function (frm, cdt, cdn) {
+		frm.trigger("update_total");
+	},
+	products_remove: function (frm, cdt, cdn) {
+		frm.trigger("update_total");
+	},
+	product_code: function (frm, cdt, cdn) {
+		let d = frappe.get_doc(cdt, cdn);
+		frappe.model.set_value(cdt, cdn, "product_name", d.product_code);
+	},
+	rate: function (frm, cdt, cdn) {
+		let d = frappe.get_doc(cdt, cdn);
+		if (d.rate && d.qty) {
+			frappe.model.set_value(cdt, cdn, "amount", d.rate * d.qty);
+		}
+		frm.trigger("update_total");
+	},
+	qty: function (frm, cdt, cdn) {
+		let d = frappe.get_doc(cdt, cdn);
+		if (d.rate && d.qty) {
+			frappe.model.set_value(cdt, cdn, "amount", d.rate * d.qty);
+		}
+		frm.trigger("update_total");
+	},
+	discount_percentage: function (frm, cdt, cdn) {
+		let d = frappe.get_doc(cdt, cdn);
+		if (d.discount_percentage && d.amount) {
+			discount_amount = (d.discount_percentage / 100) * d.amount;
+			frappe.model.set_value(
+				cdt,
+				cdn,
+				"discount_amount",
+				discount_amount
+			);
+			frappe.model.set_value(
+				cdt,
+				cdn,
+				"net_amount",
+				d.amount - discount_amount
+			);
+		}
+		frm.trigger("update_total");
+	}
 });

crm/fcrm/doctype/crm_deal/crm_deal.json

@@ -11,11 +11,18 @@
   "naming_series",
   "organization",
   "next_step",
-  "probability",
   "column_break_ijan",
   "status",
-  "close_date",
   "deal_owner",
+  "lost_reason",
+  "lost_notes",
+  "section_break_jgpm",
+  "probability",
+  "expected_deal_value",
+  "deal_value",
+  "column_break_kpxa",
+  "expected_closure_date",
+  "closed_date",
   "contacts_tab",
   "contacts",
   "contact",
@@ -32,6 +39,7 @@
   "column_break_xbyf",
   "territory",
   "currency",
+  "exchange_rate",
   "annual_revenue",
   "industry",
   "person_section",
@@ -43,6 +51,12 @@
   "mobile_no",
   "phone",
   "gender",
+  "products_tab",
+  "products",
+  "section_break_ccbj",
+  "total",
+  "column_break_udbq",
+  "net_total",
   "sla_tab",
   "sla",
   "sla_creation",
@@ -82,11 +96,6 @@
    "fieldtype": "Data",
    "label": "Website"
   },
-  {
-   "fieldname": "close_date",
-   "fieldtype": "Date",
-   "label": "Close Date"
-  },
   {
    "fieldname": "next_step",
    "fieldtype": "Data",
@@ -119,13 +128,13 @@
   {
    "fieldname": "email",
    "fieldtype": "Data",
-   "label": "Email",
+   "label": "Primary Email",
    "options": "Email"
   },
   {
    "fieldname": "mobile_no",
    "fieldtype": "Data",
-   "label": "Mobile No",
+   "label": "Primary Mobile No",
    "options": "Phone"
   },
   {
@@ -239,7 +248,7 @@
   {
    "fieldname": "phone",
    "fieldtype": "Data",
-   "label": "Phone",
+   "label": "Primary Phone",
    "options": "Phone"
   },
   {
@@ -334,11 +343,96 @@
    "fieldtype": "Link",
    "label": "Currency",
    "options": "Currency"
+  },
+  {
+   "fieldname": "products_tab",
+   "fieldtype": "Tab Break",
+   "label": "Products"
+  },
+  {
+   "fieldname": "products",
+   "fieldtype": "Table",
+   "label": "Products",
+   "options": "CRM Products"
+  },
+  {
+   "fieldname": "section_break_ccbj",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_udbq",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "total",
+   "fieldtype": "Currency",
+   "label": "Total",
+   "options": "currency",
+   "read_only": 1
+  },
+  {
+   "description": "Total after discount",
+   "fieldname": "net_total",
+   "fieldtype": "Currency",
+   "label": "Net Total",
+   "options": "currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_jgpm",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "deal_value",
+   "fieldtype": "Currency",
+   "label": "Deal Value",
+   "options": "currency"
+  },
+  {
+   "fieldname": "column_break_kpxa",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "lost_reason",
+   "fieldtype": "Link",
+   "label": "Lost Reason",
+   "mandatory_depends_on": "eval: doc.status == \"Lost\"",
+   "options": "CRM Lost Reason"
+  },
+  {
+   "fieldname": "lost_notes",
+   "fieldtype": "Text",
+   "label": "Lost Notes",
+   "mandatory_depends_on": "eval: doc.lost_reason == \"Other\""
+  },
+  {
+   "default": "1",
+   "description": "The rate used to convert the deal\u2019s currency to your crm's base currency (set in CRM Settings). It is set once when the currency is first added and doesn't change automatically.",
+   "fieldname": "exchange_rate",
+   "fieldtype": "Float",
+   "label": "Exchange Rate"
+  },
+  {
+   "fieldname": "expected_deal_value",
+   "fieldtype": "Currency",
+   "label": "Expected Deal Value",
+   "options": "currency"
+  },
+  {
+   "fieldname": "expected_closure_date",
+   "fieldtype": "Date",
+   "label": "Expected Closure Date"
+  },
+  {
+   "fieldname": "closed_date",
+   "fieldtype": "Date",
+   "label": "Closed Date"
   }
  ],
+ "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-12-11 14:31:41.058895",
+ "modified": "2025-08-26 12:12:56.324245",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal",
@@ -370,10 +464,11 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "show_title_field_in_link": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
  "title_field": "organization",
  "track_changes": 1
-}
+}

crm/fcrm/doctype/crm_deal/crm_deal.py

@@ -7,9 +7,8 @@ from frappe.desk.form.assign_to import add as assign
 from frappe.model.document import Document
 
 from crm.fcrm.doctype.crm_service_level_agreement.utils import get_sla
-from crm.fcrm.doctype.crm_status_change_log.crm_status_change_log import (
+from crm.fcrm.doctype.crm_status_change_log.crm_status_change_log import add_status_change_log
-	add_status_change_log,
+from crm.fcrm.doctype.fcrm_settings.fcrm_settings import get_exchange_rate
-)
 
 
 class CRMDeal(Document):
@@ -24,6 +23,11 @@ class CRMDeal(Document):
 			self.assign_agent(self.deal_owner)
 		if self.has_value_changed("status"):
 			add_status_change_log(self)
+			if frappe.db.get_value("CRM Deal Status", self.status, "type") == "Won":
+				self.closed_date = frappe.utils.nowdate()
+		self.validate_forecasting_fields()
+		self.validate_lost_reason()
+		self.update_exchange_rate()
 
 	def after_insert(self):
 		if self.deal_owner:
@@ -133,6 +137,60 @@ class CRMDeal(Document):
 		if sla:
 			sla.apply(self)
 
+	def update_closed_date(self):
+		"""
+		Update the closed date based on the "Won" status.
+		"""
+		if self.status == "Won" and not self.closed_date:
+			self.closed_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 update_expected_deal_value(self):
+		"""
+		Update the expected deal value based on the net total or total.
+		"""
+		if (
+			frappe.db.get_single_value("FCRM Settings", "auto_update_expected_deal_value")
+			and (self.net_total or self.total)
+			and self.expected_deal_value
+		):
+			self.expected_deal_value = self.net_total or self.total
+
+	def validate_forecasting_fields(self):
+		self.update_closed_date()
+		self.update_default_probability()
+		self.update_expected_deal_value()
+		if frappe.db.get_single_value("FCRM Settings", "enable_forecasting"):
+			if not self.expected_deal_value or self.expected_deal_value == 0:
+				frappe.throw(_("Expected Deal Value is required."), frappe.MandatoryError)
+			if not self.expected_closure_date:
+				frappe.throw(_("Expected Closure Date is required."), frappe.MandatoryError)
+
+	def validate_lost_reason(self):
+		"""
+		Validate the lost reason if the status is set to "Lost".
+		"""
+		if self.status and frappe.get_cached_value("CRM Deal Status", self.status, "type") == "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.lost_notes:
+				frappe.throw(_("Please specify the reason for losing the deal."), frappe.ValidationError)
+
+	def update_exchange_rate(self):
+		if self.has_value_changed("currency") or not self.exchange_rate:
+			system_currency = frappe.db.get_single_value("FCRM Settings", "currency") or "USD"
+			exchange_rate = 1
+			if self.currency and self.currency != system_currency:
+				exchange_rate = get_exchange_rate(self.currency, system_currency)
+
+			self.db_set("exchange_rate", exchange_rate)
+
 	@staticmethod
 	def default_list_data():
 		columns = [

crm/fcrm/doctype/crm_deal_status/crm_deal_status.json

@@ -7,8 +7,11 @@
  "engine": "InnoDB",
  "field_order": [
   "deal_status",
-  "color",
+  "type",
-  "position"
+  "position",
+  "column_break_ojiu",
+  "probability",
+  "color"
  ],
  "fields": [
   {
@@ -32,11 +35,30 @@
    "fieldtype": "Int",
    "in_list_view": 1,
    "label": "Position"
+  },
+  {
+   "fieldname": "probability",
+   "fieldtype": "Percent",
+   "in_list_view": 1,
+   "label": "Probability"
+  },
+  {
+   "default": "Open",
+   "fieldname": "type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Type",
+   "options": "Open\nOngoing\nOn Hold\nWon\nLost"
+  },
+  {
+   "fieldname": "column_break_ojiu",
+   "fieldtype": "Column Break"
   }
  ],
+ "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-19 21:56:44.552134",
+ "modified": "2025-07-11 16:03:28.077955",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Deal Status",
@@ -68,7 +90,8 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
+}

crm/fcrm/doctype/crm_exotel_settings/crm_exotel_settings.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 Exotel Settings", {
+// 	refresh(frm) {
+
+// 	},
+// });

crm/fcrm/doctype/crm_exotel_settings/crm_exotel_settings.json

@@ -0,0 +1,136 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-01-08 15:55:50.710356",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "enabled",
+  "column_break_uxtz",
+  "record_call",
+  "section_break_kfez",
+  "account_sid",
+  "subdomain",
+  "column_break_qwfn",
+  "webhook_verify_token",
+  "section_break_iuct",
+  "api_key",
+  "column_break_hyen",
+  "api_token"
+ ],
+ "fields": [
+  {
+   "default": "0",
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "label": "Enabled"
+  },
+  {
+   "fieldname": "section_break_kfez",
+   "fieldtype": "Section Break",
+   "hide_border": 1
+  },
+  {
+   "depends_on": "enabled",
+   "fieldname": "account_sid",
+   "fieldtype": "Data",
+   "label": "Account SID",
+   "mandatory_depends_on": "enabled"
+  },
+  {
+   "depends_on": "enabled",
+   "fieldname": "section_break_iuct",
+   "fieldtype": "Section Break",
+   "hide_border": 1
+  },
+  {
+   "fieldname": "column_break_hyen",
+   "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "enabled",
+   "fieldname": "api_key",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "API Key",
+   "mandatory_depends_on": "enabled"
+  },
+  {
+   "fieldname": "column_break_uxtz",
+   "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "enabled",
+   "fieldname": "api_token",
+   "fieldtype": "Password",
+   "in_list_view": 1,
+   "label": "API Token",
+   "mandatory_depends_on": "enabled"
+  },
+  {
+   "default": "0",
+   "depends_on": "enabled",
+   "fieldname": "record_call",
+   "fieldtype": "Check",
+   "label": "Record Outgoing Calls"
+  },
+  {
+   "fieldname": "column_break_qwfn",
+   "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "enabled",
+   "fieldname": "webhook_verify_token",
+   "fieldtype": "Data",
+   "label": "Webhook Verify Token",
+   "mandatory_depends_on": "enabled"
+  },
+  {
+   "depends_on": "enabled",
+   "fieldname": "subdomain",
+   "fieldtype": "Data",
+   "label": "Subdomain",
+   "mandatory_depends_on": "enabled"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2025-01-22 19:54:20.074393",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Exotel Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Sales Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "All",
+   "share": 1
+  }
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}

crm/fcrm/doctype/crm_exotel_settings/crm_exotel_settings.py

@@ -0,0 +1,26 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import frappe
+import requests
+from frappe import _
+from frappe.model.document import Document
+
+
+class CRMExotelSettings(Document):
+	def validate(self):
+		self.verify_credentials()
+
+	def verify_credentials(self):
+		if self.enabled:
+			response = requests.get(
+				"https://{subdomain}/v1/Accounts/{sid}".format(
+					subdomain=self.subdomain, sid=self.account_sid
+				),
+				auth=(self.api_key, self.get_password("api_token")),
+			)
+			if response.status_code != 200:
+				frappe.throw(
+					_(f"Please enter valid exotel Account SID, API key & API token: {response.reason}"),
+					title=_("Invalid credentials"),
+				)

crm/fcrm/doctype/crm_exotel_settings/test_crm_exotel_settings.py

@@ -0,0 +1,29 @@
+# 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 UnitTestCRMExotelSettings(UnitTestCase):
+	"""
+	Unit tests for CRMExotelSettings.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class IntegrationTestCRMExotelSettings(IntegrationTestCase):
+	"""
+	Integration tests for CRMExotelSettings.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass

crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.json

@@ -27,7 +27,7 @@
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Type",
-   "options": "Quick Entry\nSide Panel\nData Fields\nGrid Row"
+   "options": "Quick Entry\nSide Panel\nData Fields\nGrid Row\nRequired Fields"
   },
   {
    "fieldname": "section_break_ttpm",
@@ -46,7 +46,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-01-02 22:12:51.663011",
+ "modified": "2025-02-21 13:09:49.573515",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Fields Layout",

crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py

@@ -24,10 +24,12 @@ def get_fields_layout(doctype: str, type: str, parent_doctype: str | None = None
 	if layout and layout.layout:
 		tabs = json.loads(layout.layout)
 
-	if not tabs:
+	if not tabs and type != "Required Fields":
 		tabs = get_default_layout(doctype)
 
-	has_tabs = tabs[0].get("sections") if tabs and tabs[0] else False
+	has_tabs = False
+	if isinstance(tabs, list) and len(tabs) > 0 and isinstance(tabs[0], dict):
+		has_tabs = any("sections" in tab for tab in tabs)
 
 	if not has_tabs:
 		tabs = [{"name": "first_tab", "sections": tabs}]
@@ -45,9 +47,19 @@ 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"):
+				section["columns"] = [column for column in section.get("columns") if column]
 			for column in section.get("columns") if section.get("columns") else []:
+				column["fields"] = [field for field in column.get("fields") if field]
 				for field in column.get("fields") if column.get("fields") else []:
 					field = next((f for f in fields if f.fieldname == field), None)
 					if field:
@@ -55,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 []
 
 
@@ -78,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 []:
@@ -95,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": ["expected_closure_date", "probability", "expected_deal_value"],
+						}
+					],
+				},
+			)
+
+
 def handle_perm_level_restrictions(field, doctype, parent_doctype=None):
 	if field.permlevel == 0:
 		return

crm/fcrm/doctype/crm_form_script/crm_form_script.json

@@ -65,7 +65,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-16 19:40:19.340948",
+ "modified": "2025-05-19 17:57:24.610295",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Form Script",
@@ -83,9 +83,19 @@
    "role": "Sales Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "All",
+   "share": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
+}

crm/fcrm/doctype/crm_global_settings/crm_global_settings.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 Global Settings", {
+// 	refresh(frm) {
+
+// 	},
+// });

crm/fcrm/doctype/crm_global_settings/crm_global_settings.json

@@ -0,0 +1,98 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "format:{type}-{dt}",
+ "creation": "2025-02-28 14:37:10.002433",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "dt",
+  "column_break_kipp",
+  "type",
+  "section_break_vass",
+  "json"
+ ],
+ "fields": [
+  {
+   "default": "DocType",
+   "fieldname": "dt",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "DocType",
+   "options": "DocType",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_kipp",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Type",
+   "options": "Quick Filters\nSidebar Items",
+   "reqd": 1
+  },
+  {
+   "fieldname": "section_break_vass",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "json",
+   "fieldtype": "JSON",
+   "label": "JSON"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2025-03-02 14:03:49.372132",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Global Settings",
+ "naming_rule": "Expression",
+ "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 User",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}

crm/fcrm/doctype/crm_global_settings/crm_global_settings.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 CRMGlobalSettings(Document):
+	pass

crm/fcrm/doctype/crm_global_settings/test_crm_global_settings.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 UnitTestCRMGlobalSettings(UnitTestCase):
+	"""
+	Unit tests for CRMGlobalSettings.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class IntegrationTestCRMGlobalSettings(IntegrationTestCase):
+	"""
+	Integration tests for CRMGlobalSettings.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass

crm/fcrm/doctype/crm_invitation/crm_invitation.json

@@ -27,7 +27,7 @@
    "fieldtype": "Select",
    "in_list_view": 1,
    "label": "Role",
-   "options": "\nSales User\nSales Manager",
+   "options": "\nSales User\nSales Manager\nSystem Manager",
    "reqd": 1
   },
   {
@@ -66,7 +66,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-03 14:59:29.450018",
+ "modified": "2025-06-17 17:20:18.935395",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Invitation",
@@ -106,7 +106,8 @@
    "share": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
+}

crm/fcrm/doctype/crm_invitation/crm_invitation.py

@@ -21,7 +21,7 @@ class CRMInvitation(Document):
 		if frappe.local.dev_server:
 			print(f"Invite link for {self.email}: {invite_link}")
 
-		title = f"Frappe CRM"
+		title = "Frappe CRM"
 		template = "crm_invitation"
 
 		frappe.sendmail(
@@ -35,7 +35,7 @@ class CRMInvitation(Document):
 
 	@frappe.whitelist()
 	def accept_invitation(self):
-		frappe.only_for("System Manager")
+		frappe.only_for(["System Manager", "Sales Manager"])
 		self.accept()
 
 	def accept(self):
@@ -44,12 +44,28 @@ class CRMInvitation(Document):
 
 		user = self.create_user_if_not_exists()
 		user.append_roles(self.role)
+		if self.role == "System Manager":
+			user.append_roles("Sales Manager", "Sales User")
+		elif self.role == "Sales Manager":
+			user.append_roles("Sales User")
+		if self.role == "Sales User":
+			self.update_module_in_user(user, "FCRM")
 		user.save(ignore_permissions=True)
 
 		self.status = "Accepted"
 		self.accepted_at = frappe.utils.now()
 		self.save(ignore_permissions=True)
 
+	def update_module_in_user(self, user, module):
+		block_modules = frappe.get_all(
+			"Module Def",
+			fields=["name as module"],
+			filters={"name": ["!=", module]},
+		)
+
+		if block_modules:
+			user.set("block_modules", block_modules)
+
 	def create_user_if_not_exists(self):
 		if not frappe.db.exists("User", self.email):
 			first_name = self.email.split("@")[0].title()

crm/fcrm/doctype/crm_lead/api.py

@@ -1,14 +0,0 @@
-import frappe
-
-from crm.api.doc import get_assigned_users, get_fields_meta
-from crm.fcrm.doctype.crm_form_script.crm_form_script import get_form_script
-
-
-@frappe.whitelist()
-def get_lead(name):
-	lead = frappe.get_doc("CRM Lead", name).as_dict()
-
-	lead["fields_meta"] = get_fields_meta("CRM Lead")
-	lead["_form_script"] = get_form_script("CRM Lead")
-	lead["_assign"] = get_assigned_users("CRM Lead", lead.name)
-	return lead

crm/fcrm/doctype/crm_lead/crm_lead.js

@@ -5,4 +5,68 @@ frappe.ui.form.on("CRM Lead", {
 	refresh(frm) {
 		frm.add_web_link(`/crm/leads/${frm.doc.name}`, __("Open in Portal"));
 	},
+	update_total: function (frm) {
+		let total = 0;
+		let total_qty = 0;
+		let net_total = 0;
+		frm.doc.products.forEach((d) => {
+			total += d.amount;
+			total_qty += d.qty;
+			net_total += d.net_amount;
+		});
+
+		frappe.model.set_value(frm.doctype, frm.docname, "total", total);
+		frappe.model.set_value(
+			frm.doctype,
+			frm.docname,
+			"net_total",
+			net_total || total
+		);
+	}
 });
+
+frappe.ui.form.on("CRM Products", {
+	products_add: function (frm, cdt, cdn) {
+		frm.trigger("update_total");
+	},
+	products_remove: function (frm, cdt, cdn) {
+		frm.trigger("update_total");
+	},
+	product_code: function (frm, cdt, cdn) {
+		let d = frappe.get_doc(cdt, cdn);
+		frappe.model.set_value(cdt, cdn, "product_name", d.product_code);
+	},
+	rate: function (frm, cdt, cdn) {
+		let d = frappe.get_doc(cdt, cdn);
+		if (d.rate && d.qty) {
+			frappe.model.set_value(cdt, cdn, "amount", d.rate * d.qty);
+		}
+		frm.trigger("update_total");
+	},
+	qty: function (frm, cdt, cdn) {
+		let d = frappe.get_doc(cdt, cdn);
+		if (d.rate && d.qty) {
+			frappe.model.set_value(cdt, cdn, "amount", d.rate * d.qty);
+		}
+		frm.trigger("update_total");
+	},
+	discount_percentage: function (frm, cdt, cdn) {
+		let d = frappe.get_doc(cdt, cdn);
+		if (d.discount_percentage && d.amount) {
+			discount_amount = (d.discount_percentage / 100) * d.amount;
+			frappe.model.set_value(
+				cdt,
+				cdn,
+				"discount_amount",
+				discount_amount
+			);
+			frappe.model.set_value(
+				cdt,
+				cdn,
+				"net_amount",
+				d.amount - discount_amount
+			);
+		}
+		frm.trigger("update_total");
+	}
+});

crm/fcrm/doctype/crm_lead/crm_lead.json

@@ -37,6 +37,12 @@
   "annual_revenue",
   "image",
   "converted",
+  "products_tab",
+  "products",
+  "section_break_ggwh",
+  "total",
+  "column_break_uisv",
+  "net_total",
   "sla_tab",
   "sla",
   "sla_creation",
@@ -285,12 +291,47 @@
    "fieldtype": "Table",
    "label": "Status Change Log",
    "options": "CRM Status Change Log"
+  },
+  {
+   "fieldname": "products_tab",
+   "fieldtype": "Tab Break",
+   "label": "Products"
+  },
+  {
+   "fieldname": "products",
+   "fieldtype": "Table",
+   "label": "Products",
+   "options": "CRM Products"
+  },
+  {
+   "fieldname": "section_break_ggwh",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "total",
+   "fieldtype": "Currency",
+   "label": "Total",
+   "options": "currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_uisv",
+   "fieldtype": "Column Break"
+  },
+  {
+   "description": "Total after discount",
+   "fieldname": "net_total",
+   "fieldtype": "Currency",
+   "label": "Net Total",
+   "options": "currency",
+   "read_only": 1
   }
  ],
+ "grid_page_length": 50,
  "image_field": "image",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-01-02 22:14:01.991054",
+ "modified": "2025-05-14 19:51:06.184569",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Lead",
@@ -331,6 +372,7 @@
    "share": 1
   }
  ],
+ "row_format": "Dynamic",
  "sender_field": "email",
  "sender_name_field": "first_name",
  "show_title_field_in_link": 1,
@@ -339,4 +381,4 @@
  "states": [],
  "title_field": "lead_name",
  "track_changes": 1
-}
+}

crm/fcrm/doctype/crm_lead/crm_lead.py

@@ -115,13 +115,14 @@ class CRMLead(Document):
 			elif user != agent:
 				frappe.share.remove(self.doctype, self.name, user)
 
-	def create_contact(self, throw=True):
+	def create_contact(self, existing_contact=None, throw=True):
 		if not self.lead_name:
 			self.set_full_name()
 			self.set_lead_name()
 
-		existing_contact = self.contact_exists(throw)
+		existing_contact = existing_contact or self.contact_exists(throw)
 		if existing_contact:
+			self.update_lead_contact(existing_contact)
 			return existing_contact
 
 		contact = frappe.new_doc("Contact")
@@ -151,12 +152,15 @@ class CRMLead(Document):
 
 		return contact.name
 
-	def create_organization(self):
+	def create_organization(self, existing_organization=None):
-		if not self.organization:
+		if not self.organization and not existing_organization:
 			return
 
-		existing_organization = frappe.db.exists("CRM Organization", {"organization_name": self.organization})
+		existing_organization = existing_organization or frappe.db.exists(
+			"CRM Organization", {"organization_name": self.organization}
+		)
 		if existing_organization:
+			self.db_set("organization", existing_organization)
 			return existing_organization
 
 		organization = frappe.new_doc("CRM Organization")
@@ -172,6 +176,20 @@ class CRMLead(Document):
 		organization.insert(ignore_permissions=True)
 		return organization.name
 
+	def update_lead_contact(self, contact):
+		contact = frappe.get_cached_doc("Contact", contact)
+		frappe.db.set_value(
+			"CRM Lead",
+			self.name,
+			{
+				"salutation": contact.salutation,
+				"first_name": contact.first_name,
+				"last_name": contact.last_name,
+				"email": contact.email_id,
+				"mobile_no": contact.mobile_no,
+			},
+		)
+
 	def contact_exists(self, throw=True):
 		email_exist = frappe.db.exists("Contact Email", {"email_id": self.email})
 		phone_exist = frappe.db.exists("Contact Phone", {"phone": self.phone})
@@ -197,8 +215,8 @@ class CRMLead(Document):
 
 		return False
 
-	def create_deal(self, contact, organization):
+	def create_deal(self, contact, organization, deal=None):
-		deal = frappe.new_doc("CRM Deal")
+		new_deal = frappe.new_doc("CRM Deal")
 
 		lead_deal_map = {
 			"lead_owner": "deal_owner",
@@ -211,7 +229,6 @@ class CRMLead(Document):
 			"HTML",
 			"Button",
 			"Attach",
-			"Table",
 		]
 		restricted_map_fields = [
 			"name",
@@ -233,6 +250,7 @@ class CRMLead(Document):
 			"first_responded_on",
 			"communication_status",
 			"sla_creation",
+			"status_change_log",
 		]
 
 		for field in self.meta.fields:
@@ -245,13 +263,13 @@ class CRMLead(Document):
 			if field.fieldname in lead_deal_map:
 				fieldname = lead_deal_map[field.fieldname]
 
-			if hasattr(deal, fieldname):
+			if hasattr(new_deal, fieldname):
 				if fieldname == "organization":
-					deal.update({fieldname: organization})
+					new_deal.update({fieldname: organization})
 				else:
-					deal.update({fieldname: self.get(field.fieldname)})
+					new_deal.update({fieldname: self.get(field.fieldname)})
 
-		deal.update(
+		new_deal.update(
 			{
 				"lead": self.name,
 				"contacts": [{"contact": contact}],
@@ -259,7 +277,7 @@ class CRMLead(Document):
 		)
 
 		if self.first_responded_on:
-			deal.update(
+			new_deal.update(
 				{
 					"sla_creation": self.sla_creation,
 					"response_by": self.response_by,
@@ -270,8 +288,11 @@ class CRMLead(Document):
 				}
 			)
 
-		deal.insert(ignore_permissions=True)
+		if deal:
-		return deal.name
+			new_deal.update(deal)
+
+		new_deal.insert(ignore_permissions=True)
+		return new_deal.name
 
 	def set_sla(self):
 		"""
@@ -297,8 +318,8 @@ class CRMLead(Document):
 		if sla:
 			sla.apply(self)
 
-	def convert_to_deal(self):
+	def convert_to_deal(self, deal=None):
-		return convert_to_deal(lead=self.name, doc=self)
+		return convert_to_deal(lead=self.name, doc=self, deal=deal)
 
 	@staticmethod
 	def get_non_filterable_fields():
@@ -380,7 +401,7 @@ class CRMLead(Document):
 
 
 @frappe.whitelist()
-def convert_to_deal(lead, doc=None):
+def convert_to_deal(lead, doc=None, deal=None, existing_contact=None, existing_organization=None):
 	if not (doc and doc.flags.get("ignore_permissions")) and not frappe.has_permission(
 		"CRM Lead", "write", lead
 	):
@@ -392,7 +413,7 @@ def convert_to_deal(lead, doc=None):
 	lead.db_set("converted", 1)
 	if lead.sla and frappe.db.exists("CRM Communication Status", "Replied"):
 		lead.db_set("communication_status", "Replied")
-	contact = lead.create_contact(False)
+	contact = lead.create_contact(existing_contact, False)
-	organization = lead.create_organization()
+	organization = lead.create_organization(existing_organization)
-	deal = lead.create_deal(contact, organization)
+	_deal = lead.create_deal(contact, organization, deal)
-	return deal
+	return _deal

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": []
-}
+}

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) {
+
+// 	},
+// });

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": []
+}

crm/fcrm/doctype/crm_lost_reason/crm_lost_reason.py

@@ -1,9 +1,9 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
+# 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 TwilioAgents(Document):
+class CRMLostReason(Document):
 	pass

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

crm/fcrm/doctype/crm_notification/crm_notification.py

@@ -8,7 +8,8 @@ from frappe.model.document import Document
 
 class CRMNotification(Document):
 	def on_update(self):
-		frappe.publish_realtime("crm_notification")
+		if self.to_user:
+			frappe.publish_realtime("crm_notification", user= self.to_user)
 
 def notify_user(args):
 	"""
@@ -33,4 +34,4 @@ def notify_user(args):
 
 	if frappe.db.exists("CRM Notification", values):
 		return
-	frappe.get_doc(values).insert(ignore_permissions=True)
+	frappe.get_doc(values).insert(ignore_permissions=True)

crm/fcrm/doctype/crm_organization/crm_organization.json

@@ -10,6 +10,7 @@
   "organization_name",
   "no_of_employees",
   "currency",
+  "exchange_rate",
   "annual_revenue",
   "organization_logo",
   "column_break_pnpp",
@@ -74,12 +75,18 @@
    "fieldtype": "Link",
    "label": "Address",
    "options": "Address"
+  },
+  {
+   "description": "The rate used to convert the organization\u2019s currency to your crm's base currency (set in CRM Settings). It is set once when the currency is first added and doesn't change automatically.",
+   "fieldname": "exchange_rate",
+   "fieldtype": "Float",
+   "label": "Exchange Rate"
   }
  ],
  "image_field": "organization_logo",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-09-17 18:37:10.341062",
+ "modified": "2025-07-15 11:40:12.175598",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Organization",
@@ -111,7 +118,8 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
+}

crm/fcrm/doctype/crm_organization/crm_organization.py

@@ -4,51 +4,65 @@
 import frappe
 from frappe.model.document import Document
 
+from crm.fcrm.doctype.fcrm_settings.fcrm_settings import get_exchange_rate
+
 
 class CRMOrganization(Document):
-		@staticmethod
+	def validate(self):
-		def default_list_data():
+		self.update_exchange_rate()
-			columns = [
+
-				{
+	def update_exchange_rate(self):
-					'label': 'Organization',
+		if self.has_value_changed("currency") or not self.exchange_rate:
-					'type': 'Data',
+			system_currency = frappe.db.get_single_value("FCRM Settings", "currency") or "USD"
-					'key': 'organization_name',
+			exchange_rate = 1
-					'width': '16rem',
+			if self.currency and self.currency != system_currency:
-				},
+				exchange_rate = get_exchange_rate(self.currency, system_currency)
-				{
+
-					'label': 'Website',
+			self.db_set("exchange_rate", exchange_rate)
-					'type': 'Data',
+
-					'key': 'website',
+	@staticmethod
-					'width': '14rem',
+	def default_list_data():
-				},
+		columns = [
-				{
+			{
-					'label': 'Industry',
+				"label": "Organization",
-					'type': 'Link',
+				"type": "Data",
-					'key': 'industry',
+				"key": "organization_name",
-					'options': 'CRM Industry',
+				"width": "16rem",
-					'width': '14rem',
+			},
-				},
+			{
-				{
+				"label": "Website",
-					'label': 'Annual Revenue',
+				"type": "Data",
-					'type': 'Currency',
+				"key": "website",
-					'key': 'annual_revenue',
+				"width": "14rem",
-					'width': '14rem',
+			},
-				},
+			{
-				{
+				"label": "Industry",
-					'label': 'Last Modified',
+				"type": "Link",
-					'type': 'Datetime',
+				"key": "industry",
-					'key': 'modified',
+				"options": "CRM Industry",
-					'width': '8rem',
+				"width": "14rem",
-				},
+			},
-			]
+			{
-			rows = [
+				"label": "Annual Revenue",
-				"name",
+				"type": "Currency",
-				"organization_name",
+				"key": "annual_revenue",
-				"organization_logo",
+				"width": "14rem",
-				"website",
+			},
-				"industry",
+			{
-				"currency",
+				"label": "Last Modified",
-				"annual_revenue",
+				"type": "Datetime",
-				"modified",
+				"key": "modified",
-			]
+				"width": "8rem",
-			return {'columns': columns, 'rows': rows}
+			},
+		]
+		rows = [
+			"name",
+			"organization_name",
+			"organization_logo",
+			"website",
+			"industry",
+			"currency",
+			"annual_revenue",
+			"modified",
+		]
+		return {"columns": columns, "rows": rows}

crm/fcrm/doctype/crm_product/crm_product.js

@@ -0,0 +1,9 @@
+// Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on("CRM Product", {
+	product_code: function (frm) {
+		if (!frm.doc.product_name)
+			frm.set_value("product_name", frm.doc.product_code);
+	}
+});

crm/fcrm/doctype/crm_product/crm_product.json

@@ -0,0 +1,105 @@
+{
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:product_code",
+ "creation": "2025-04-28 11:45:09.309636",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "naming_series",
+  "product_code",
+  "product_name",
+  "column_break_bpdj",
+  "disabled",
+  "standard_rate",
+  "image",
+  "section_break_rtwm",
+  "description"
+ ],
+ "fields": [
+  {
+   "fieldname": "naming_series",
+   "fieldtype": "Select",
+   "label": "Naming Series",
+   "options": "CRM-PROD-.YYYY.-"
+  },
+  {
+   "fieldname": "product_code",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Product Code",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "product_name",
+   "fieldtype": "Data",
+   "label": "Product Name"
+  },
+  {
+   "fieldname": "column_break_bpdj",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "disabled",
+   "fieldtype": "Check",
+   "label": "Disabled"
+  },
+  {
+   "fieldname": "image",
+   "fieldtype": "Attach Image",
+   "label": "Image"
+  },
+  {
+   "fieldname": "section_break_rtwm",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "label": "Description"
+  },
+  {
+   "fieldname": "standard_rate",
+   "fieldtype": "Currency",
+   "label": "Standard Selling Rate"
+  }
+ ],
+ "grid_page_length": 50,
+ "image_field": "image",
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "make_attachments_public": 1,
+ "modified": "2025-04-28 12:47:25.087957",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Product",
+ "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
+  }
+ ],
+ "quick_entry": 1,
+ "row_format": "Dynamic",
+ "search_fields": "product_name,description",
+ "show_name_in_global_search": 1,
+ "show_preview_popup": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "product_name",
+ "track_changes": 1
+}

crm/fcrm/doctype/crm_product/crm_product.py

@@ -0,0 +1,16 @@
+# 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 CRMProduct(Document):
+	def validate(self):
+		self.set_product_name()
+
+	def set_product_name(self):
+		if not self.product_name:
+			self.product_name = self.product_code
+		else:
+			self.product_name = self.product_name.strip()

crm/fcrm/doctype/crm_product/test_crm_product.py

@@ -0,0 +1,29 @@
+# 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 UnitTestCRMProduct(UnitTestCase):
+	"""
+	Unit tests for CRMProduct.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class IntegrationTestCRMProduct(IntegrationTestCase):
+	"""
+	Integration tests for CRMProduct.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass

crm/fcrm/doctype/crm_products/crm_products.json

@@ -0,0 +1,136 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-04-28 12:50:49.812915",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "product_code",
+  "column_break_gvbc",
+  "product_name",
+  "section_break_fnvf",
+  "qty",
+  "column_break_ajac",
+  "rate",
+  "section_break_olqb",
+  "discount_percentage",
+  "column_break_uvra",
+  "discount_amount",
+  "section_break_cnpb",
+  "column_break_pozr",
+  "amount",
+  "column_break_ejqw",
+  "net_amount"
+ ],
+ "fields": [
+  {
+   "fieldname": "column_break_gvbc",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "product_name",
+   "fieldtype": "Data",
+   "label": "Product Name",
+   "reqd": 1
+  },
+  {
+   "fieldname": "section_break_fnvf",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "section_break_olqb",
+   "fieldtype": "Section Break"
+  },
+  {
+   "bold": 1,
+   "fieldname": "discount_percentage",
+   "fieldtype": "Percent",
+   "label": "Discount %"
+  },
+  {
+   "fieldname": "discount_amount",
+   "fieldtype": "Currency",
+   "label": "Discount Amount",
+   "options": "currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_cnpb",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_pozr",
+   "fieldtype": "Column Break"
+  },
+  {
+   "bold": 1,
+   "fieldname": "rate",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Rate",
+   "options": "currency",
+   "reqd": 1
+  },
+  {
+   "bold": 1,
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "label": "Amount",
+   "options": "currency",
+   "read_only": 1
+  },
+  {
+   "bold": 1,
+   "depends_on": "discount_percentage",
+   "description": "Amount after discount",
+   "fieldname": "net_amount",
+   "fieldtype": "Currency",
+   "label": "Net Amount",
+   "options": "currency",
+   "read_only": 1
+  },
+  {
+   "bold": 1,
+   "columns": 5,
+   "fieldname": "product_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Product",
+   "options": "CRM Product"
+  },
+  {
+   "bold": 1,
+   "default": "1",
+   "fieldname": "qty",
+   "fieldtype": "Float",
+   "label": "Quantity"
+  },
+  {
+   "fieldname": "column_break_ajac",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_uvra",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "column_break_ejqw",
+   "fieldtype": "Column Break"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2025-05-14 18:52:26.183306",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Products",
+ "owner": "Administrator",
+ "permissions": [],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}

crm/fcrm/doctype/crm_products/crm_products.py

@@ -0,0 +1,110 @@
+# 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 CRMProducts(Document):
+	pass
+
+
+def create_product_details_script(doctype):
+	if not frappe.db.exists("CRM Form Script", "Product Details Script for " + doctype):
+		script = get_product_details_script(doctype)
+		frappe.get_doc(
+			{
+				"doctype": "CRM Form Script",
+				"name": "Product Details Script for " + doctype,
+				"dt": doctype,
+				"view": "Form",
+				"script": script,
+				"enabled": 1,
+				"is_standard": 1,
+			}
+		).insert()
+
+
+def get_product_details_script(doctype):
+	doctype_class = "class " + doctype.replace(" ", "")
+
+	return (
+		doctype_class
+		+ " {"
+		+ """
+  update_total() {
+    let total = 0
+    let total_qty = 0
+    let net_total = 0
+    let discount_applied = false
+
+    this.doc.products.forEach((d) => {
+      total += d.amount
+      net_total += d.net_amount
+      if (d.discount_percentage > 0) {
+        discount_applied = true
+      }
+    })
+
+    this.doc.total = total
+    this.doc.net_total = net_total || total
+
+    if (!net_total && discount_applied) {
+      this.doc.net_total = net_total
+    }
+  }
+}
+
+class CRMProducts {
+  products_add() {
+    let row = this.doc.getRow('products')
+    row.trigger('qty')
+    this.doc.trigger('update_total')
+  }
+
+  products_remove() {
+    this.doc.trigger('update_total')
+  }
+
+  async product_code(idx) {
+    let row = this.doc.getRow('products', idx)
+
+    let a = await call("frappe.client.get_value", {
+        doctype: "CRM Product",
+        filters: { name: row.product_code },
+        fieldname: ["product_name", "standard_rate"],
+    })
+
+    row.product_name = a.product_name
+    if (a.standard_rate && !row.rate) {
+        row.rate = a.standard_rate
+        row.trigger("rate")
+    }
+  }
+
+  qty(idx) {
+    let row = this.doc.getRow('products', idx)
+    row.amount = row.qty * row.rate
+    row.trigger('discount_percentage', idx)
+  }
+
+  rate() {
+    let row = this.doc.getRow('products')
+    row.amount = row.qty * row.rate
+    row.trigger('discount_percentage')
+  }
+
+  discount_percentage(idx) {
+    let row = this.doc.getRow('products', idx)
+    if (!row.discount_percentage) {
+      row.net_amount = row.amount
+      row.discount_amount = 0
+    }
+    if (row.discount_percentage && row.amount) {
+      row.discount_amount = (row.discount_percentage / 100) * row.amount
+      row.net_amount = row.amount - row.discount_amount
+    }
+    this.doc.trigger('update_total')
+  }
+}"""
+	)

crm/fcrm/doctype/crm_service_level_agreement/crm_service_level_agreement.py

@@ -25,7 +25,7 @@ class CRMServiceLevelAgreement(Document):
 		if self.default:
 			other_slas = frappe.get_all(
 				"CRM Service Level Agreement",
-				filters={"apply_on": self.apply_on, "default": True},
+				filters={"apply_on": self.apply_on, "default": True, "name": ["!=", self.name]},
 				fields=["name"],
 			)
 			if other_slas:

crm/fcrm/doctype/crm_status_change_log/crm_status_change_log.json

@@ -13,6 +13,8 @@
   "column_break_mwmz",
   "duration",
   "last_status_change_log",
+  "from_type",
+  "to_type",
   "log_owner"
  ],
  "fields": [
@@ -61,18 +63,31 @@
    "fieldtype": "Link",
    "label": "Owner",
    "options": "User"
+  },
+  {
+   "fieldname": "from_type",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "From Type"
+  },
+  {
+   "fieldname": "to_type",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "To Type"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-01-06 13:26:40.597277",
+ "modified": "2025-07-13 12:37:41.278584",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Status Change Log",
  "owner": "Administrator",
  "permissions": [],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []
-}
+}

crm/fcrm/doctype/crm_status_change_log/crm_status_change_log.py

@@ -1,15 +1,17 @@
 # Copyright (c) 2024, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-import frappe
 from datetime import datetime
-from frappe.utils import add_to_date, get_datetime
+
+import frappe
 from frappe.model.document import Document
+from frappe.utils import add_to_date, get_datetime
 
 
 class CRMStatusChangeLog(Document):
 	pass
 
+
 def get_duration(from_date, to_date):
 	if not isinstance(from_date, datetime):
 		from_date = get_datetime(from_date)
@@ -18,28 +20,45 @@ def get_duration(from_date, to_date):
 	duration = to_date - from_date
 	return duration.total_seconds()
 
+
 def add_status_change_log(doc):
+	to_status_type = frappe.db.get_value("CRM Deal Status", doc.status, "type") if doc.status else None
+
 	if not doc.is_new():
 		previous_status = doc.get_doc_before_save().status if doc.get_doc_before_save() else None
+		previous_status_type = (
+			frappe.db.get_value("CRM Deal Status", previous_status, "type") if previous_status else None
+		)
 		if not doc.status_change_log and previous_status:
 			now_minus_one_minute = add_to_date(datetime.now(), minutes=-1)
-			doc.append("status_change_log", {
+			doc.append(
-				"from": previous_status,
+				"status_change_log",
-				"to": "",
+				{
-				"from_date": now_minus_one_minute,
+					"from": previous_status,
-				"to_date": "",
+					"from_type": previous_status_type or "",
-				"log_owner": frappe.session.user,
+					"to": "",
-			})
+					"to_type": "",
+					"from_date": now_minus_one_minute,
+					"to_date": "",
+					"log_owner": frappe.session.user,
+				},
+			)
 		last_status_change = doc.status_change_log[-1]
 		last_status_change.to = doc.status
+		last_status_change.to_type = to_status_type or ""
 		last_status_change.to_date = datetime.now()
 		last_status_change.log_owner = frappe.session.user
 		last_status_change.duration = get_duration(last_status_change.from_date, last_status_change.to_date)
 
-	doc.append("status_change_log", {
+	doc.append(
-		"from": doc.status,
+		"status_change_log",
-		"to": "",
+		{
-		"from_date": datetime.now(),
+			"from": doc.status,
-		"to_date": "",
+			"from_type": to_status_type or "",
-		"log_owner": frappe.session.user,
+			"to": "",
-	})
+			"to_type": "",
+			"from_date": datetime.now(),
+			"to_date": "",
+			"log_owner": frappe.session.user,
+		},
+	)

crm/fcrm/doctype/crm_telephony_agent/crm_telephony_agent.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 Telephony Agent", {
+// 	refresh(frm) {
+
+// 	},
+// });

crm/fcrm/doctype/crm_telephony_agent/crm_telephony_agent.json

@@ -0,0 +1,140 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:user",
+ "creation": "2025-01-11 16:12:46.602782",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "user",
+  "user_name",
+  "column_break_hdec",
+  "mobile_no",
+  "default_medium",
+  "section_break_ozjn",
+  "twilio",
+  "twilio_number",
+  "call_receiving_device",
+  "column_break_aydj",
+  "exotel",
+  "exotel_number",
+  "section_break_phlq",
+  "phone_nos"
+ ],
+ "fields": [
+  {
+   "fieldname": "user",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "User",
+   "options": "User",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "column_break_hdec",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "mobile_no",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Mobile No.",
+   "read_only": 1
+  },
+  {
+   "fetch_from": "user.full_name",
+   "fieldname": "user_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "User Name"
+  },
+  {
+   "depends_on": "exotel",
+   "fieldname": "exotel_number",
+   "fieldtype": "Data",
+   "label": "Exotel Number",
+   "mandatory_depends_on": "exotel"
+  },
+  {
+   "fieldname": "section_break_phlq",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "section_break_ozjn",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "column_break_aydj",
+   "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "twilio",
+   "fieldname": "twilio_number",
+   "fieldtype": "Data",
+   "label": "Twilio Number",
+   "mandatory_depends_on": "twilio"
+  },
+  {
+   "fieldname": "phone_nos",
+   "fieldtype": "Table",
+   "label": "Phone Numbers",
+   "options": "CRM Telephony Phone"
+  },
+  {
+   "default": "0",
+   "fieldname": "twilio",
+   "fieldtype": "Check",
+   "label": "Twilio"
+  },
+  {
+   "default": "0",
+   "fieldname": "exotel",
+   "fieldtype": "Check",
+   "label": "Exotel"
+  },
+  {
+   "fieldname": "default_medium",
+   "fieldtype": "Select",
+   "label": "Default Medium",
+   "options": "\nTwilio\nExotel"
+  },
+  {
+   "default": "Computer",
+   "depends_on": "twilio",
+   "fieldname": "call_receiving_device",
+   "fieldtype": "Select",
+   "label": "Device",
+   "options": "Computer\nPhone"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2025-01-23 22:24:53.448716",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Telephony Agent",
+ "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
+  }
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "user_name"
+}

crm/fcrm/doctype/crm_telephony_agent/crm_telephony_agent.py

@@ -0,0 +1,34 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+
+class CRMTelephonyAgent(Document):
+	def validate(self):
+		self.set_primary()
+
+	def set_primary(self):
+		# Used to set primary mobile no.
+		if len(self.phone_nos) == 0:
+			self.mobile_no = ""
+			return
+
+		is_primary = [phone.number for phone in self.phone_nos if phone.get("is_primary")]
+
+		if len(is_primary) > 1:
+			frappe.throw(
+				_("Only one {0} can be set as primary.").format(frappe.bold(frappe.unscrub("mobile_no")))
+			)
+
+		primary_number_exists = False
+		for d in self.phone_nos:
+			if d.get("is_primary") == 1:
+				primary_number_exists = True
+				self.mobile_no = d.number
+				break
+
+		if not primary_number_exists:
+			self.mobile_no = ""

crm/fcrm/doctype/crm_telephony_agent/test_crm_telephony_agent.py

@@ -0,0 +1,29 @@
+# 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 UnitTestCRMTelephonyAgent(UnitTestCase):
+	"""
+	Unit tests for CRMTelephonyAgent.
+	Use this class for testing individual functions and methods.
+	"""
+
+	pass
+
+
+class IntegrationTestCRMTelephonyAgent(IntegrationTestCase):
+	"""
+	Integration tests for CRMTelephonyAgent.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass

crm/fcrm/doctype/crm_telephony_phone/crm_telephony_phone.json

@@ -0,0 +1,40 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-01-19 13:57:01.702519",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "number",
+  "is_primary"
+ ],
+ "fields": [
+  {
+   "fieldname": "number",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Number",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "is_primary",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Is Primary"
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2025-01-19 13:58:59.063775",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "CRM Telephony Phone",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}

crm/fcrm/doctype/crm_telephony_phone/crm_telephony_phone.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 CRMTelephonyPhone(Document):
+	pass

crm/fcrm/doctype/crm_twilio_settings/crm_twilio_settings.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 
-// frappe.ui.form.on("Twilio Settings", {
+// frappe.ui.form.on("CRM Twilio Settings", {
 // 	refresh(frm) {
 
 // 	},

crm/fcrm/doctype/crm_twilio_settings/crm_twilio_settings.json

@@ -23,6 +23,7 @@
  ],
  "fields": [
   {
+   "depends_on": "enabled",
    "fieldname": "account_sid",
    "fieldtype": "Data",
    "in_list_view": 1,
@@ -30,6 +31,7 @@
    "mandatory_depends_on": "eval: doc.enabled"
   },
   {
+   "depends_on": "enabled",
    "fieldname": "api_key",
    "fieldtype": "Data",
    "label": "API Key",
@@ -37,6 +39,7 @@
    "read_only": 1
   },
   {
+   "depends_on": "enabled",
    "fieldname": "api_secret",
    "fieldtype": "Password",
    "label": "API Secret",
@@ -48,6 +51,7 @@
    "fieldtype": "Column Break"
   },
   {
+   "depends_on": "enabled",
    "fieldname": "auth_token",
    "fieldtype": "Password",
    "in_list_view": 1,
@@ -55,11 +59,11 @@
    "mandatory_depends_on": "eval: doc.enabled"
   },
   {
+   "depends_on": "enabled",
    "fieldname": "twiml_sid",
    "fieldtype": "Data",
    "label": "TwiML SID",
-   "permlevel": 1,
+   "permlevel": 1
-   "read_only": 1
   },
   {
    "fieldname": "section_break_ssqj",
@@ -67,6 +71,7 @@
   },
   {
    "default": "0",
+   "depends_on": "enabled",
    "fieldname": "record_calls",
    "fieldtype": "Check",
    "label": "Record Calls"
@@ -77,7 +82,8 @@
   },
   {
    "fieldname": "section_break_malx",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "hide_border": 1
   },
   {
    "default": "0",
@@ -87,7 +93,8 @@
   },
   {
    "fieldname": "section_break_eklq",
-   "fieldtype": "Section Break"
+   "fieldtype": "Section Break",
+   "hide_border": 1
   },
   {
    "fieldname": "column_break_yqvr",
@@ -97,10 +104,10 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-12-30 19:23:04.401439",
+ "modified": "2025-08-19 13:36:19.823197",
  "modified_by": "Administrator",
  "module": "FCRM",
- "name": "Twilio Settings",
+ "name": "CRM Twilio Settings",
  "owner": "Administrator",
  "permissions": [
   {
@@ -144,8 +151,9 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}

crm/fcrm/doctype/crm_twilio_settings/crm_twilio_settings.py

@@ -2,13 +2,13 @@
 # For license information, please see license.txt
 
 import frappe
-from frappe.model.document import Document
 from frappe import _
-
+from frappe.model.document import Document
 from twilio.rest import Client
 
-class TwilioSettings(Document):
+
-	friendly_resource_name = "Frappe CRM" # System creates TwiML app & API keys with this name.
+class CRMTwilioSettings(Document):
+	friendly_resource_name = "Frappe CRM"  # System creates TwiML app & API keys with this name.
 
 	def validate(self):
 		self.validate_twilio_account()
@@ -33,28 +33,26 @@ class TwilioSettings(Document):
 			frappe.throw(_("Invalid Account SID or Auth Token."))
 
 	def set_api_credentials(self, twilio):
-		"""Generate Twilio API credentials if not exist and update them.
+		"""Generate Twilio API credentials if not exist and update them."""
-		"""
 		if self.api_key and self.api_secret:
 			return
 		new_key = self.create_api_key(twilio)
 		self.api_key = new_key.sid
 		self.api_secret = new_key.secret
-		frappe.db.set_value('Twilio Settings', 'Twilio Settings', {
+		frappe.db.set_value(
-			'api_key': self.api_key,
+			"CRM Twilio Settings",
-			'api_secret': self.api_secret
+			"CRM Twilio Settings",
-		})
+			{"api_key": self.api_key, "api_secret": self.api_secret},
+		)
 
 	def set_application_credentials(self, twilio):
-		"""Generate TwiML app credentials if not exist and update them.
+		"""Generate TwiML app credentials if not exist and update them."""
-		"""
 		credentials = self.get_application(twilio) or self.create_application(twilio)
 		self.twiml_sid = credentials.sid
-		frappe.db.set_value('Twilio Settings', 'Twilio Settings', 'twiml_sid', self.twiml_sid)
+		frappe.db.set_value("CRM Twilio Settings", "CRM Twilio Settings", "twiml_sid", self.twiml_sid)
 
 	def create_api_key(self, twilio):
-		"""Create API keys in twilio account.
+		"""Create API keys in twilio account."""
-		"""
 		try:
 			return twilio.new_keys.create(friendly_name=self.friendly_resource_name)
 		except Exception:
@@ -66,23 +64,21 @@ class TwilioSettings(Document):
 		return get_public_url(url_path)
 
 	def get_application(self, twilio, friendly_name=None):
-		"""Get TwiML App from twilio account if exists.
+		"""Get TwiML App from twilio account if exists."""
-		"""
 		friendly_name = friendly_name or self.friendly_resource_name
 		applications = twilio.applications.list(friendly_name)
 		return applications and applications[0]
 
 	def create_application(self, twilio, friendly_name=None):
-		"""Create TwilML App in twilio account.
+		"""Create TwilML App in twilio account."""
-		"""
 		friendly_name = friendly_name or self.friendly_resource_name
 		application = twilio.applications.create(
-						voice_method='POST',
+			voice_method="POST", voice_url=self.get_twilio_voice_url(), friendly_name=friendly_name
-						voice_url=self.get_twilio_voice_url(),
+		)
-						friendly_name=friendly_name
-					)
 		return application
 
-def get_public_url(path: str=None):
+
+def get_public_url(path: str | None = None):
 	from frappe.utils import get_url
-	return get_url().split(":8", 1)[0] + path
+
+	return get_url().split(":8", 1)[0] + path

crm/fcrm/doctype/crm_twilio_settings/test_crm_twilio_settings.py

@@ -5,5 +5,5 @@
 from frappe.tests import UnitTestCase
 
 
-class TestTwilioAgents(UnitTestCase):
+class TestCRMTwilioSettings(UnitTestCase):
 	pass

crm/fcrm/doctype/crm_view_settings/crm_view_settings.json

@@ -8,6 +8,7 @@
   "label",
   "icon",
   "user",
+  "is_standard",
   "is_default",
   "column_break_zacm",
   "type",
@@ -112,12 +113,6 @@
    "fieldtype": "Check",
    "label": "Public"
   },
-  {
-   "default": "0",
-   "fieldname": "is_default",
-   "fieldtype": "Check",
-   "label": "Is Default"
-  },
   {
    "fieldname": "icon",
    "fieldtype": "Data",
@@ -174,15 +169,26 @@
    "label": "Kanban Fields"
   },
   {
-   "default": "name",
    "fieldname": "title_field",
    "fieldtype": "Data",
    "label": "Title Field"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_standard",
+   "fieldtype": "Check",
+   "label": "Is Standard"
+  },
+  {
+   "default": "0",
+   "fieldname": "is_default",
+   "fieldtype": "Check",
+   "label": "Is Default"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-06-25 19:40:12.067788",
+ "modified": "2025-02-20 15:36:55.059065",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM View Settings",

crm/fcrm/doctype/crm_view_settings/crm_view_settings.py

@@ -1,6 +1,7 @@
 # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 import json
+
 import frappe
 from frappe.model.document import Document, get_controller
 from frappe.utils import parse_json
@@ -9,15 +10,16 @@ from frappe.utils import parse_json
 class CRMViewSettings(Document):
 	pass
 
+
 @frappe.whitelist()
 def create(view):
 	view = frappe._dict(view)
 
 	view.filters = parse_json(view.filters) or {}
-	view.columns = parse_json(view.columns or '[]')
+	view.columns = parse_json(view.columns or "[]")
-	view.rows = parse_json(view.rows or '[]')
+	view.rows = parse_json(view.rows or "[]")
-	view.kanban_columns = parse_json(view.kanban_columns or '[]')
+	view.kanban_columns = parse_json(view.kanban_columns or "[]")
-	view.kanban_fields = parse_json(view.kanban_fields or '[]')
+	view.kanban_fields = parse_json(view.kanban_fields or "[]")
 
 	default_rows = sync_default_rows(view.doctype)
 	view.rows = view.rows + default_rows if default_rows else view.rows
@@ -31,11 +33,11 @@ def create(view):
 	doc = frappe.new_doc("CRM View Settings")
 	doc.name = view.label
 	doc.label = view.label
-	doc.type = view.type or 'list'
+	doc.type = view.type or "list"
 	doc.icon = view.icon
 	doc.dt = view.doctype
 	doc.user = frappe.session.user
-	doc.route_name = view.route_name or ""
+	doc.route_name = view.route_name or get_route_name(view.doctype)
 	doc.load_default_columns = view.load_default_columns or False
 	doc.filters = json.dumps(view.filters)
 	doc.order_by = view.order_by
@@ -49,6 +51,7 @@ def create(view):
 	doc.insert()
 	return doc
 
+
 @frappe.whitelist()
 def update(view):
 	view = frappe._dict(view)
@@ -65,9 +68,9 @@ def update(view):
 
 	doc = frappe.get_doc("CRM View Settings", view.name)
 	doc.label = view.label
-	doc.type = view.type or 'list'
+	doc.type = view.type or "list"
 	doc.icon = view.icon
-	doc.route_name = view.route_name or ""
+	doc.route_name = view.route_name or get_route_name(view.doctype)
 	doc.load_default_columns = view.load_default_columns or False
 	doc.filters = json.dumps(filters)
 	doc.order_by = view.order_by
@@ -81,11 +84,13 @@ def update(view):
 	doc.save()
 	return doc
 
+
 @frappe.whitelist()
 def delete(name):
 	if frappe.db.exists("CRM View Settings", name):
 		frappe.delete_doc("CRM View Settings", name)
 
+
 @frappe.whitelist()
 def public(name, value):
 	if frappe.session.user != "Administrator" and "Sales Manager" not in frappe.get_roles():
@@ -98,15 +103,18 @@ def public(name, value):
 	doc.user = "" if value else frappe.session.user
 	doc.save()
 
+
 @frappe.whitelist()
 def pin(name, value):
 	doc = frappe.get_doc("CRM View Settings", name)
 	doc.pinned = value
 	doc.save()
 
+
 def remove_duplicates(l):
 	return list(dict.fromkeys(l))
 
+
 def sync_default_rows(doctype, type="list"):
 	list = get_controller(doctype)
 	rows = []
@@ -116,6 +124,7 @@ def sync_default_rows(doctype, type="list"):
 
 	return rows
 
+
 def sync_default_columns(view):
 	list = get_controller(view.doctype)
 	columns = []
@@ -137,14 +146,32 @@ def sync_default_columns(view):
 
 
 @frappe.whitelist()
-def create_or_update_default_view(view):
+def set_as_default(name=None, type=None, doctype=None):
+	if name:
+		frappe.db.set_value("CRM View Settings", name, "is_default", 1)
+	else:
+		doc = create_or_update_standard_view({"type": type, "doctype": doctype, "is_default": 1})
+		name = doc.name
+
+	# remove default from other views of same user
+	frappe.db.set_value(
+		"CRM View Settings",
+		{"name": ("!=", name), "user": frappe.session.user, "is_default": 1},
+		"is_default",
+		0,
+	)
+
+
+@frappe.whitelist()
+def create_or_update_standard_view(view):
 	view = frappe._dict(view)
 
 	filters = parse_json(view.filters) or {}
-	columns = parse_json(view.columns or '[]')
+	columns = parse_json(view.columns or "[]")
-	rows = parse_json(view.rows or '[]')
+	rows = parse_json(view.rows or "[]")
-	kanban_columns = parse_json(view.kanban_columns or '[]')
+	kanban_columns = parse_json(view.kanban_columns or "[]")
-	kanban_fields = parse_json(view.kanban_fields or '[]')
+	kanban_fields = parse_json(view.kanban_fields or "[]")
+	view.column_field = view.column_field or "status"
 
 	default_rows = sync_default_rows(view.doctype, view.type)
 	rows = rows + default_rows if default_rows else rows
@@ -157,47 +184,63 @@ def create_or_update_default_view(view):
 
 	doc = frappe.db.exists(
 		"CRM View Settings",
-		{
+		{"dt": view.doctype, "type": view.type or "list", "is_standard": True, "user": frappe.session.user},
-			"dt": view.doctype,
-			"type": view.type or 'list',
-			"is_default": True,
-			"user": frappe.session.user
-		},
 	)
 	if doc:
 		doc = frappe.get_doc("CRM View Settings", doc)
 		doc.label = view.label
-		doc.type = view.type or 'list'
+		doc.type = view.type or "list"
-		doc.route_name = view.route_name or ""
+		doc.route_name = view.route_name or get_route_name(view.doctype)
 		doc.load_default_columns = view.load_default_columns or False
 		doc.filters = json.dumps(filters)
-		doc.order_by = view.order_by
+		doc.order_by = view.order_by or "modified desc"
-		doc.group_by_field = view.group_by_field
+		doc.group_by_field = view.group_by_field or "owner"
 		doc.column_field = view.column_field
 		doc.title_field = view.title_field
 		doc.kanban_columns = json.dumps(kanban_columns)
 		doc.kanban_fields = json.dumps(kanban_fields)
 		doc.columns = json.dumps(columns)
 		doc.rows = json.dumps(rows)
+		doc.is_default = view.is_default or False
 		doc.save()
 	else:
 		doc = frappe.new_doc("CRM View Settings")
-		label = 'Group By View' if view.type == 'group_by' else 'List View'
+
+		label = "List"
+		if view.type == "group_by":
+			label = "Group By"
+		elif view.type == "kanban":
+			label = "Kanban"
+
 		doc.name = view.label or label
 		doc.label = view.label or label
-		doc.type = view.type or 'list'
+		doc.type = view.type or "list"
 		doc.dt = view.doctype
 		doc.user = frappe.session.user
-		doc.route_name = view.route_name or ""
+		doc.route_name = view.route_name or get_route_name(view.doctype)
 		doc.load_default_columns = view.load_default_columns or False
 		doc.filters = json.dumps(filters)
-		doc.order_by = view.order_by
+		doc.order_by = view.order_by or "modified desc"
-		doc.group_by_field = view.group_by_field
+		doc.group_by_field = view.group_by_field or "owner"
 		doc.column_field = view.column_field
 		doc.title_field = view.title_field
 		doc.kanban_columns = json.dumps(kanban_columns)
 		doc.kanban_fields = json.dumps(kanban_fields)
 		doc.columns = json.dumps(columns)
 		doc.rows = json.dumps(rows)
-		doc.is_default = True
+		doc.is_standard = True
-		doc.insert()
+		doc.is_default = view.is_default or False
+		doc.insert()
+
+	return doc
+
+
+def get_route_name(doctype):
+	# Example: "CRM Lead" -> "Leads"
+	if doctype.startswith("CRM "):
+		doctype = doctype[4:]
+
+	if doctype[-1] != "s":
+		doctype += "s"
+
+	return doctype

crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.py

@@ -1,22 +1,24 @@
 # Copyright (c) 2024, Frappe and contributors
 # For license information, please see license.txt
 
+import json
+
 import frappe
 from frappe import _
 from frappe.custom.doctype.property_setter.property_setter import make_property_setter
-from frappe.model.document import Document
 from frappe.frappeclient import FrappeClient
+from frappe.model.document import Document
 from frappe.utils import get_url_to_form, get_url_to_list
-import json
+
 
 class ERPNextCRMSettings(Document):
 	def validate(self):
 		if self.enabled:
 			self.validate_if_erpnext_installed()
 			self.add_quotation_to_option()
-			self.create_custom_fields()	
+			self.create_custom_fields()
 			self.create_crm_form_script()
-	
+
 	def validate_if_erpnext_installed(self):
 		if not self.is_erpnext_in_different_site:
 			if "erpnext" not in frappe.get_installed_apps():
@@ -37,6 +39,7 @@ class ERPNextCRMSettings(Document):
 	def create_custom_fields(self):
 		if not self.is_erpnext_in_different_site:
 			from erpnext.crm.frappe_crm_api import create_custom_fields_for_frappe_crm
+
 			create_custom_fields_for_frappe_crm()
 		else:
 			self.create_custom_fields_in_remote_site()
@@ -48,22 +51,24 @@ class ERPNextCRMSettings(Document):
 		except Exception:
 			frappe.log_error(
 				frappe.get_traceback(),
-				f"Error while creating custom field in the remote erpnext site: {self.erpnext_site_url}"
+				f"Error while creating custom field in the remote erpnext site: {self.erpnext_site_url}",
 			)
 			frappe.throw("Error while creating custom field in ERPNext, check error log for more details")
 
 	def create_crm_form_script(self):
 		if not frappe.db.exists("CRM Form Script", "Create Quotation from CRM Deal"):
 			script = get_crm_form_script()
-			frappe.get_doc({
+			frappe.get_doc(
-				"doctype": "CRM Form Script",
+				{
-				"name": "Create Quotation from CRM Deal",
+					"doctype": "CRM Form Script",
-				"dt": "CRM Deal",
+					"name": "Create Quotation from CRM Deal",
-				"view": "Form",
+					"dt": "CRM Deal",
-				"script": script,
+					"view": "Form",
-				"enabled": 1,
+					"script": script,
-				"is_standard": 1
+					"enabled": 1,
-			}).insert()
+					"is_standard": 1,
+				}
+			).insert()
 
 	@frappe.whitelist()
 	def reset_erpnext_form_script(self):
@@ -77,14 +82,14 @@ class ERPNextCRMSettings(Document):
 			frappe.log_error(frappe.get_traceback(), "Error while resetting form script")
 			return False
 
+
 def get_erpnext_site_client(erpnext_crm_settings):
 	site_url = erpnext_crm_settings.erpnext_site_url
 	api_key = erpnext_crm_settings.api_key
 	api_secret = erpnext_crm_settings.get_password("api_secret", raise_exception=False)
 
-	return FrappeClient(
+	return FrappeClient(site_url, api_key=api_key, api_secret=api_secret)
-		site_url, api_key=api_key, api_secret=api_secret
+
-	)
 
 @frappe.whitelist()
 def get_customer_link(crm_deal):
@@ -107,7 +112,7 @@ def get_customer_link(crm_deal):
 		except Exception:
 			frappe.log_error(
 				frappe.get_traceback(),
-				f"Error while fetching customer in remote site: {erpnext_crm_settings.erpnext_site_url}"
+				f"Error while fetching customer in remote site: {erpnext_crm_settings.erpnext_site_url}",
 			)
 			frappe.throw(_("Error while fetching customer in ERPNext, check error log for more details"))
 
@@ -118,23 +123,54 @@ def get_quotation_url(crm_deal, organization):
 	if not erpnext_crm_settings.enabled:
 		frappe.throw(_("ERPNext is not integrated with the CRM"))
 
+	contact = get_contact(crm_deal)
+	address = get_organization_address(organization)
+	address = address.get("name") if address else None
+
 	if not erpnext_crm_settings.is_erpnext_in_different_site:
-		quotation_url = get_url_to_list("Quotation")
+		base_url = f"{get_url_to_list('Quotation')}/new"
-		return f"{quotation_url}/new?quotation_to=CRM Deal&crm_deal={crm_deal}&party_name={crm_deal}&company={erpnext_crm_settings.erpnext_company}"
+		params = {
+			"quotation_to": "CRM Deal",
+			"crm_deal": crm_deal,
+			"party_name": crm_deal,
+			"company": erpnext_crm_settings.erpnext_company,
+			"contact_person": contact,
+			"customer_address": address
+		}
 	else:
 		site_url = erpnext_crm_settings.get("erpnext_site_url")
-		quotation_url = f"{site_url}/app/quotation"
+		base_url = f"{site_url}/app/quotation/new"
-
 		prospect = create_prospect_in_remote_site(crm_deal, erpnext_crm_settings)
-		return f"{quotation_url}/new?quotation_to=Prospect&crm_deal={crm_deal}&party_name={prospect}&company={erpnext_crm_settings.erpnext_company}"
+		params = {
+			"quotation_to": "Prospect",
+			"crm_deal": crm_deal,
+			"party_name": prospect,
+			"company": erpnext_crm_settings.erpnext_company,
+			"contact_person": contact,
+			"customer_address": address
+		}
+	
+	# Filter out None values and build query string
+	query_string = "&".join(
+		f"{key}={value}" for key, value in params.items() 
+		if value is not None
+	)
+
+	return f"{base_url}?{query_string}"
+
 
 def create_prospect_in_remote_site(crm_deal, erpnext_crm_settings):
 	try:
 		client = get_erpnext_site_client(erpnext_crm_settings)
-		doc = frappe.get_doc("CRM Deal", crm_deal)
+		doc = frappe.get_cached_doc("CRM Deal", crm_deal)
 		contacts = get_contacts(doc)
-		address = get_organization_address(doc.organization)
+		address = get_organization_address(doc.organization) or None
-		return client.post_api("erpnext.crm.frappe_crm_api.create_prospect_against_crm_deal",
+
+		if address and not isinstance(address, dict):
+			address = address.as_dict()
+
+		return client.post_api(
+			"erpnext.crm.frappe_crm_api.create_prospect_against_crm_deal",
 			{
 				"organization": doc.organization,
 				"lead_name": doc.lead_name,
@@ -145,34 +181,49 @@ def create_prospect_in_remote_site(crm_deal, erpnext_crm_settings):
 				"industry": doc.industry,
 				"website": doc.website,
 				"annual_revenue": doc.annual_revenue,
-				"contacts": json.dumps(contacts),
+				"contacts": json.dumps(contacts) if contacts else None,
 				"erpnext_company": erpnext_crm_settings.erpnext_company,
-				"address": address.as_dict() if address else None
+				"address": json.dumps(address) if address else None,
 			},
 		)
 	except Exception:
 		frappe.log_error(
 			frappe.get_traceback(),
-			f"Error while creating prospect in remote site: {erpnext_crm_settings.erpnext_site_url}"
+			f"Error while creating prospect in remote site: {erpnext_crm_settings.erpnext_site_url}",
 		)
 		frappe.throw(_("Error while creating prospect in ERPNext, check error log for more details"))
 
+
+def get_contact(crm_deal):
+	doc = frappe.get_cached_doc("CRM Deal", crm_deal)
+	contact = None
+	for c in doc.contacts:
+		if c.is_primary:
+			contact = c.contact
+			break
+
+	return contact
+
+
 def get_contacts(doc):
 	contacts = []
 	for c in doc.contacts:
-		contacts.append({
+		contacts.append(
-			"contact": c.contact,
+			{
-			"full_name": c.full_name,
+				"contact": c.contact,
-			"email": c.email,
+				"full_name": c.full_name,
-			"mobile_no": c.mobile_no,
+				"email": c.email,
-			"gender": c.gender,
+				"mobile_no": c.mobile_no,
-			"is_primary": c.is_primary,
+				"gender": c.gender,
-		})
+				"is_primary": c.is_primary,
+			}
+		)
 	return contacts
 
+
 def get_organization_address(organization):
 	address = frappe.db.get_value("CRM Organization", organization, "address")
-	address = frappe.get_doc("Address", address) if address else None
+	address = frappe.get_cached_doc("Address", address) if address else None
 	if not address:
 		return None
 	return {
@@ -188,6 +239,7 @@ def get_organization_address(organization):
 		"pincode": address.pincode,
 	}
 
+
 def create_customer_in_erpnext(doc, method):
 	erpnext_crm_settings = frappe.get_single("ERPNext CRM Settings")
 	if (
@@ -196,7 +248,7 @@ def create_customer_in_erpnext(doc, method):
 		or doc.status != erpnext_crm_settings.deal_status
 	):
 		return
-	
+
 	contacts = get_contacts(doc)
 	address = get_organization_address(doc.organization)
 	customer = {
@@ -213,27 +265,27 @@ def create_customer_in_erpnext(doc, method):
 	}
 	if not erpnext_crm_settings.is_erpnext_in_different_site:
 		from erpnext.crm.frappe_crm_api import create_customer
+
 		create_customer(customer)
 	else:
 		create_customer_in_remote_site(customer, erpnext_crm_settings)
 
 	frappe.publish_realtime("crm_customer_created")
 
+
 def create_customer_in_remote_site(customer, erpnext_crm_settings):
 	client = get_erpnext_site_client(erpnext_crm_settings)
 	try:
 		client.post_api("erpnext.crm.frappe_crm_api.create_customer", customer)
 	except Exception:
-		frappe.log_error(
+		frappe.log_error(frappe.get_traceback(), "Error while creating customer in remote site")
-			frappe.get_traceback(),
-			"Error while creating customer in remote site"
-		)
 		frappe.throw(_("Error while creating customer in ERPNext, check error log for more details"))
 
+
 @frappe.whitelist()
 def get_crm_form_script():
-	return  """
+	return """
-async function setupForm({ doc, call, $dialog, updateField, createToast }) {
+async function setupForm({ doc, call, $dialog, updateField, toast }) {
 	let actions = [];
 	let is_erpnext_integration_enabled = await call("frappe.client.get_single_value", {doctype: "ERPNext CRM Settings", field: "enabled"});
 	if (!["Lost", "Won"].includes(doc?.status) && is_erpnext_integration_enabled) {

crm/fcrm/doctype/fcrm_note/fcrm_note.json

@@ -19,7 +19,8 @@
    "fieldtype": "Data",
    "in_list_view": 1,
    "in_standard_filter": 1,
-   "label": "Title"
+   "label": "Title",
+   "reqd": 1
   },
   {
    "fieldname": "content",
@@ -49,7 +50,7 @@
    "link_fieldname": "note"
   }
  ],
- "modified": "2024-01-19 21:56:30.123334",
+ "modified": "2025-04-01 15:30:14.742001",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "FCRM Note",

crm/fcrm/doctype/fcrm_settings/fcrm_settings.json

@@ -7,6 +7,14 @@
  "field_order": [
   "defaults_tab",
   "restore_defaults",
+  "enable_forecasting",
+  "auto_update_expected_deal_value",
+  "currency_tab",
+  "currency",
+  "exchange_rate_provider_section",
+  "service_provider",
+  "column_break_vqck",
+  "access_key",
   "branding_tab",
   "brand_name",
   "brand_logo",
@@ -28,7 +36,7 @@
   {
    "fieldname": "defaults_tab",
    "fieldtype": "Tab Break",
-   "label": "Defaults"
+   "label": "Settings"
   },
   {
    "fieldname": "branding_tab",
@@ -56,12 +64,61 @@
    "fieldname": "favicon",
    "fieldtype": "Attach",
    "label": "Favicon"
+  },
+  {
+   "default": "0",
+   "description": "It will make deal's \"Expected Closure Date\" & \"Expected Deal Value\" mandatory to get accurate forecasting insights",
+   "fieldname": "enable_forecasting",
+   "fieldtype": "Check",
+   "label": "Enable Forecasting"
+  },
+  {
+   "fieldname": "currency",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Currency",
+   "options": "Currency"
+  },
+  {
+   "fieldname": "currency_tab",
+   "fieldtype": "Tab Break",
+   "label": "Currency"
+  },
+  {
+   "fieldname": "exchange_rate_provider_section",
+   "fieldtype": "Section Break",
+   "label": "Exchange Rate Provider"
+  },
+  {
+   "default": "frankfurter.app",
+   "fieldname": "service_provider",
+   "fieldtype": "Select",
+   "label": "Service Provider",
+   "options": "frankfurter.app\nexchangerate.host"
+  },
+  {
+   "depends_on": "eval:doc.service_provider == 'exchangerate.host';",
+   "fieldname": "access_key",
+   "fieldtype": "Data",
+   "label": "Access Key",
+   "mandatory_depends_on": "eval:doc.service_provider == 'exchangerate.host';"
+  },
+  {
+   "fieldname": "column_break_vqck",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "1",
+   "description": "Automatically update \"Expected Deal Value\" based on the total value of associated products in a deal",
+   "fieldname": "auto_update_expected_deal_value",
+   "fieldtype": "Check",
+   "label": "Auto Update Expected Deal Value"
   }
  ],
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-12-30 19:21:30.847343",
+ "modified": "2025-09-16 17:33:26.406549",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "FCRM Settings",
@@ -95,7 +152,8 @@
    "share": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
+}

crm/fcrm/doctype/fcrm_settings/fcrm_settings.py

@@ -2,6 +2,9 @@
 # For license information, please see license.txt
 
 import frappe
+import requests
+from frappe import _
+from frappe.custom.doctype.property_setter.property_setter import delete_property_setter, make_property_setter
 from frappe.model.document import Document
 
 from crm.install import after_install
@@ -12,6 +15,67 @@ class FCRMSettings(Document):
 	def restore_defaults(self, force=False):
 		after_install(force)
 
+	def validate(self):
+		self.do_not_allow_to_delete_if_standard()
+		self.setup_forecasting()
+		self.make_currency_read_only()
+
+	def do_not_allow_to_delete_if_standard(self):
+		if not self.has_value_changed("dropdown_items"):
+			return
+		old_items = self.get_doc_before_save().get("dropdown_items")
+		standard_new_items = [d.name1 for d in self.dropdown_items if d.is_standard]
+		standard_old_items = [d.name1 for d in old_items if d.is_standard]
+		deleted_standard_items = set(standard_old_items) - set(standard_new_items)
+		if deleted_standard_items:
+			standard_dropdown_items = get_standard_dropdown_items()
+			if not deleted_standard_items.intersection(standard_dropdown_items):
+				return
+			frappe.throw(_("Cannot delete standard items {0}").format(", ".join(deleted_standard_items)))
+
+	def setup_forecasting(self):
+		if self.has_value_changed("enable_forecasting"):
+			if not self.enable_forecasting:
+				delete_property_setter(
+					"CRM Deal",
+					"reqd",
+					"expected_closure_date",
+				)
+				delete_property_setter(
+					"CRM Deal",
+					"reqd",
+					"expected_deal_value",
+				)
+			else:
+				make_property_setter(
+					"CRM Deal",
+					"expected_closure_date",
+					"reqd",
+					1 if self.enable_forecasting else 0,
+					"Check",
+				)
+				make_property_setter(
+					"CRM Deal",
+					"expected_deal_value",
+					"reqd",
+					1 if self.enable_forecasting else 0,
+					"Check",
+				)
+
+	def make_currency_read_only(self):
+		if self.currency and self.has_value_changed("currency"):
+			make_property_setter(
+				"FCRM Settings",
+				"currency",
+				"read_only",
+				1,
+				"Check",
+			)
+
+
+def get_standard_dropdown_items():
+	return [item.get("name1") for item in frappe.get_hooks("standard_dropdown_items")]
+
 
 def after_migrate():
 	sync_table("dropdown_items", "standard_dropdown_items")
@@ -26,7 +90,7 @@ def sync_table(key, hook):
 	count = 0  # maintain count because list may come from seperate apps
 	for item in frappe.get_hooks(hook):
 		if item.get("name1") not in existing_items:
-			crm_settings.append(key, item)
+			crm_settings.append(key, item, count)
 		new_standard_items[item.get("name1")] = True
 		count += 1
 
@@ -36,3 +100,109 @@ def sync_table(key, hook):
 	crm_settings.set(key, items)
 
 	crm_settings.save()
+
+
+def create_forecasting_script():
+	if not frappe.db.exists("CRM Form Script", "Forecasting Script"):
+		script = get_forecasting_script()
+		frappe.get_doc(
+			{
+				"doctype": "CRM Form Script",
+				"name": "Forecasting Script",
+				"dt": "CRM Deal",
+				"view": "Form",
+				"script": script,
+				"enabled": 1,
+				"is_standard": 1,
+			}
+		).insert()
+
+
+def get_forecasting_script():
+	return """class CRMDeal {
+    async status() {
+        await this.doc.trigger('updateProbability')
+    }
+    async updateProbability() {
+        let status = await call("frappe.client.get_value", {
+            doctype: "CRM Deal Status",
+            fieldname: "probability",
+            filters: { name: this.doc.status },
+        })
+
+        this.doc.probability = status.probability
+    }
+}"""
+
+
+def get_exchange_rate(from_currency, to_currency, date=None):
+	if not date:
+		date = "latest"
+
+	api_used = "frankfurter"
+
+	api_endpoint = f"https://api.frankfurter.app/{date}?from={from_currency}&to={to_currency}"
+	res = requests.get(api_endpoint, timeout=5)
+	if res.ok:
+		data = res.json()
+		return data["rates"][to_currency]
+
+	# Fallback to exchangerate.host if Frankfurter API fails
+	settings = FCRMSettings("FCRM Settings")
+	if settings and settings.service_provider == "exchangerate.host":
+		api_used = "exchangerate.host"
+		if not settings.access_key:
+			frappe.throw(
+				_("Access Key is required for Service Provider: {0}").format(
+					frappe.bold(settings.service_provider)
+				)
+			)
+
+		params = {
+			"access_key": settings.access_key,
+			"from": from_currency,
+			"to": to_currency,
+			"amount": 1,
+		}
+
+		if date != "latest":
+			params["date"] = date
+
+		api_endpoint = "https://api.exchangerate.host/convert"
+
+		res = requests.get(api_endpoint, params=params, timeout=5)
+		if res.ok:
+			data = res.json()
+			return data["result"]
+
+	frappe.log_error(
+		title="Exchange Rate Fetch Error",
+		message=f"Failed to fetch exchange rate from {from_currency} to {to_currency} using {api_used} API.",
+	)
+
+	if api_used == "frankfurter":
+		user = frappe.session.user
+		is_manager = (
+			"System Manager" in frappe.get_roles(user)
+			or "Sales Manager" in frappe.get_roles(user)
+			or user == "Administrator"
+		)
+
+		if not is_manager:
+			frappe.throw(
+				_(
+					"Ask your manager to set up the Exchange Rate Provider, as default provider does not support currency conversion for {0} to {1}."
+				).format(from_currency, to_currency)
+			)
+		else:
+			frappe.throw(
+				_(
+					"Setup the Exchange Rate Provider as 'Exchangerate Host' in settings, as default provider does not support currency conversion for {0} to {1}."
+				).format(from_currency, to_currency)
+			)
+
+	frappe.throw(
+		_(
+			"Failed to fetch exchange rate from {0} to {1} on {2}. Please check your internet connection or try again later."
+		).format(from_currency, to_currency, date)
+	)

crm/fcrm/doctype/twilio_agents/twilio_agents.js

@@ -1,8 +0,0 @@
-// Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
-// For license information, please see license.txt
-
-// frappe.ui.form.on("Twilio Agents", {
-// 	refresh(frm) {
-
-// 	},
-// });

crm/fcrm/doctype/twilio_agents/twilio_agents.json

@@ -1,78 +0,0 @@
-{
- "actions": [],
- "allow_rename": 1,
- "autoname": "field:user",
- "creation": "2023-08-17 19:59:56.239729",
- "default_view": "List",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "user",
-  "user_name",
-  "call_receiving_device",
-  "column_break_ljne",
-  "twilio_number"
- ],
- "fields": [
-  {
-   "fieldname": "user",
-   "fieldtype": "Link",
-   "in_list_view": 1,
-   "label": "User",
-   "options": "User",
-   "unique": 1
-  },
-  {
-   "fieldname": "column_break_ljne",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "twilio_number",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Twilio Number",
-   "options": "Phone"
-  },
-  {
-   "fetch_from": "user.full_name",
-   "fieldname": "user_name",
-   "fieldtype": "Data",
-   "label": "User Name",
-   "read_only": 1
-  },
-  {
-   "default": "Computer",
-   "fieldname": "call_receiving_device",
-   "fieldtype": "Select",
-   "label": "Device",
-   "options": "Computer\nPhone"
-  }
- ],
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2024-01-19 21:57:18.626669",
- "modified_by": "Administrator",
- "module": "FCRM",
- "name": "Twilio Agents",
- "naming_rule": "By fieldname",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Sales Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "states": [],
- "track_changes": 1
-}

crm/fcrm/doctype/twilio_settings/test_twilio_settings.py

@@ -1,9 +0,0 @@
-# Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and Contributors
-# See license.txt
-
-# import frappe
-from frappe.tests import UnitTestCase
-
-
-class TestTwilioSettings(UnitTestCase):
-	pass

crm/hooks.py

@@ -132,7 +132,6 @@ before_uninstall = "crm.uninstall.before_uninstall"
 override_doctype_class = {
 	"Contact": "crm.overrides.contact.CustomContact",
 	"Email Template": "crm.overrides.email_template.CustomEmailTemplate",
-	"User": "crm.overrides.user.CustomUser",
 }
 
 # Document Events
@@ -161,6 +160,7 @@ doc_events = {
 	},
 	"User": {
 		"before_validate": ["crm.api.demo.validate_user"],
+		"validate_reset_password": ["crm.api.demo.validate_reset_password"],
 	},
 }
 
@@ -264,22 +264,6 @@ standard_dropdown_items = [
 		"route": "#",
 		"is_standard": 1,
 	},
-	{
-		"name1": "support_link",
-		"label": "Support",
-		"type": "Route",
-		"icon": "life-buoy",
-		"route": "https://t.me/frappecrm",
-		"is_standard": 1,
-	},
-	{
-		"name1": "docs_link",
-		"label": "Docs",
-		"type": "Route",
-		"icon": "book-open",
-		"route": "https://docs.frappe.io/crm",
-		"is_standard": 1,
-	},
 	{
 		"name1": "toggle_theme",
 		"label": "Toggle theme",
@@ -293,7 +277,22 @@ standard_dropdown_items = [
 		"label": "Settings",
 		"type": "Route",
 		"icon": "settings",
-  		"route": "#",
+		"route": "#",
+		"is_standard": 1,
+	},
+	{
+		"name1": "login_to_fc",
+		"label": "Login to Frappe Cloud",
+		"type": "Route",
+		"route": "#",
+		"is_standard": 1,
+	},
+	{
+		"name1": "about",
+		"label": "About",
+		"type": "Route",
+		"icon": "info",
+		"route": "#",
 		"is_standard": 1,
 	},
 	{
@@ -307,7 +306,7 @@ standard_dropdown_items = [
 		"label": "Log out",
 		"type": "Route",
 		"icon": "log-out",
-  		"route": "#",
+		"route": "#",
 		"is_standard": 1,
 	},
 ]

crm/install.py

@@ -4,6 +4,9 @@ import click
 import frappe
 from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
 
+from crm.fcrm.doctype.crm_dashboard.crm_dashboard import create_default_manager_dashboard
+from crm.fcrm.doctype.crm_products.crm_products import create_product_details_script
+
 
 def before_install():
 	pass
@@ -18,7 +21,12 @@ 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()
+	create_default_manager_dashboard(force)
+	create_assignment_rule_custom_fields()
+	add_assignment_rule_property_setters()
 	frappe.db.commit()
 
 
@@ -65,30 +73,44 @@ def add_default_deal_statuses():
 	statuses = {
 		"Qualification": {
 			"color": "gray",
+			"type": "Open",
+			"probability": 10,
 			"position": 1,
 		},
 		"Demo/Making": {
 			"color": "orange",
+			"type": "Ongoing",
+			"probability": 25,
 			"position": 2,
 		},
 		"Proposal/Quotation": {
 			"color": "blue",
+			"type": "Ongoing",
+			"probability": 50,
 			"position": 3,
 		},
 		"Negotiation": {
 			"color": "yellow",
+			"type": "Ongoing",
+			"probability": 70,
 			"position": 4,
 		},
 		"Ready to Close": {
 			"color": "purple",
+			"type": "Ongoing",
+			"probability": 90,
 			"position": 5,
 		},
 		"Won": {
 			"color": "green",
+			"type": "Won",
+			"probability": 100,
 			"position": 6,
 		},
 		"Lost": {
 			"color": "red",
+			"type": "Lost",
+			"probability": 0,
 			"position": 7,
 		},
 	}
@@ -100,6 +122,8 @@ def add_default_deal_statuses():
 		doc = frappe.new_doc("CRM Deal Status")
 		doc.deal_status = status
 		doc.color = statuses[status]["color"]
+		doc.type = statuses[status]["type"]
+		doc.probability = statuses[status]["probability"]
 		doc.position = statuses[status]["position"]
 		doc.insert()
 
@@ -138,6 +162,10 @@ def add_default_fields_layout(force=False):
 			"doctype": "Address",
 			"layout": '[{"name": "details_section", "columns": [{"name": "column_uSSG", "fields": ["address_title", "address_type", "address_line1", "address_line2", "city", "state", "country", "pincode"]}]}]',
 		},
+		"CRM Call Log-Quick Entry": {
+			"doctype": "CRM Call Log",
+			"layout": '[{"name":"details_section","columns":[{"name":"column_uMSG","fields":["type","from","duration"]},{"name":"column_wiZT","fields":["to","status","caller","receiver"]}]}]',
+		},
 	}
 
 	sidebar_fields_layouts = {
@@ -166,7 +194,7 @@ def add_default_fields_layout(force=False):
 		},
 		"CRM Deal-Data Fields": {
 			"doctype": "CRM Deal",
-			"layout": '[{"label": "Details", "name": "details_section", "opened": true, "columns": [{"name": "column_z9XL", "fields": ["organization", "annual_revenue", "next_step"]}, {"name": "column_gM4w", "fields": ["website", "close_date", "deal_owner"]}, {"name": "column_gWmE", "fields": ["territory", "probability"]}]}]',
+			"layout": '[{"name":"first_tab","sections":[{"label":"Details","name":"details_section","opened":true,"columns":[{"name":"column_z9XL","fields":["organization","annual_revenue","next_step"]},{"name":"column_gM4w","fields":["website","closed_date","deal_owner"]},{"name":"column_gWmE","fields":["territory","probability"]}]},{"label":"Products","name":"section_jHhQ","opened":true,"columns":[{"name":"column_xiNF","fields":["products"]}],"editingLabel":false,"hideLabel":true},{"label":"New Section","name":"section_WNOQ","opened":true,"columns":[{"name":"column_ziBW","fields":["total"]},{"label":"","name":"column_wuwA","fields":["net_total"]}],"hideBorder":true,"hideLabel":true}]}]',
 		},
 	}
 
@@ -336,6 +364,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["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")
 
@@ -349,3 +415,88 @@ def add_standard_dropdown_items():
 		crm_settings.append("dropdown_items", item)
 
 	crm_settings.save()
+
+
+def add_default_scripts():
+	from crm.fcrm.doctype.fcrm_settings.fcrm_settings import create_forecasting_script
+
+	for doctype in ["CRM Lead", "CRM Deal"]:
+		create_product_details_script(doctype)
+	create_forecasting_script()
+
+
+def add_assignment_rule_property_setters():
+	"""Add a property setter to the Assignment Rule DocType for assign_condition and unassign_condition."""
+
+	default_fields = {
+		"doctype": "Property Setter",
+		"doctype_or_field": "DocField",
+		"doc_type": "Assignment Rule",
+		"property_type": "Data",
+		"is_system_generated": 1,
+	}
+
+	if not frappe.db.exists("Property Setter", {"name": "Assignment Rule-assign_condition-depends_on"}):
+		frappe.get_doc(
+			{
+				**default_fields,
+				"name": "Assignment Rule-assign_condition-depends_on",
+				"field_name": "assign_condition",
+				"property": "depends_on",
+				"value": "eval: !doc.assign_condition_json",
+			}
+		).insert()
+	else:
+		frappe.db.set_value(
+			"Property Setter",
+			{"name": "Assignment Rule-assign_condition-depends_on"},
+			"value",
+			"eval: !doc.assign_condition_json",
+		)
+	if not frappe.db.exists("Property Setter", {"name": "Assignment Rule-unassign_condition-depends_on"}):
+		frappe.get_doc(
+			{
+				**default_fields,
+				"name": "Assignment Rule-unassign_condition-depends_on",
+				"field_name": "unassign_condition",
+				"property": "depends_on",
+				"value": "eval: !doc.unassign_condition_json",
+			}
+		).insert()
+	else:
+		frappe.db.set_value(
+			"Property Setter",
+			{"name": "Assignment Rule-unassign_condition-depends_on"},
+			"value",
+			"eval: !doc.unassign_condition_json",
+		)
+
+
+def create_assignment_rule_custom_fields():
+	if not frappe.get_meta("Assignment Rule").has_field("assign_condition_json"):
+		click.secho("* Installing Custom Fields in Assignment Rule")
+
+		create_custom_fields(
+			{
+				"Assignment Rule": [
+					{
+						"description": "Autogenerated field by CRM App",
+						"fieldname": "assign_condition_json",
+						"fieldtype": "Code",
+						"label": "Assign Condition JSON",
+						"insert_after": "assign_condition",
+						"depends_on": "eval: doc.assign_condition_json",
+					},
+					{
+						"description": "Autogenerated field by CRM App",
+						"fieldname": "unassign_condition_json",
+						"fieldtype": "Code",
+						"label": "Unassign Condition JSON",
+						"insert_after": "unassign_condition",
+						"depends_on": "eval: doc.unassign_condition_json",
+					},
+				],
+			}
+		)
+
+		frappe.clear_cache(doctype="Assignment Rule")

crm/integrations/api.py

@@ -0,0 +1,181 @@
+import frappe
+from frappe.query_builder import Order
+from pypika.functions import Replace
+
+from crm.utils import are_same_phone_number, parse_phone_number
+
+
+@frappe.whitelist()
+def is_call_integration_enabled():
+	twilio_enabled = frappe.db.get_single_value("CRM Twilio Settings", "enabled")
+	exotel_enabled = frappe.db.get_single_value("CRM Exotel Settings", "enabled")
+
+	return {
+		"twilio_enabled": twilio_enabled,
+		"exotel_enabled": exotel_enabled,
+		"default_calling_medium": get_user_default_calling_medium(),
+	}
+
+
+def get_user_default_calling_medium():
+	if not frappe.db.exists("CRM Telephony Agent", frappe.session.user):
+		return None
+
+	default_medium = frappe.db.get_value("CRM Telephony Agent", frappe.session.user, "default_medium")
+
+	if not default_medium:
+		return None
+
+	return default_medium
+
+
+@frappe.whitelist()
+def set_default_calling_medium(medium):
+	if not frappe.db.exists("CRM Telephony Agent", frappe.session.user):
+		frappe.get_doc(
+			{
+				"doctype": "CRM Telephony Agent",
+				"user": frappe.session.user,
+				"default_medium": medium,
+			}
+		).insert(ignore_permissions=True)
+	else:
+		frappe.db.set_value("CRM Telephony Agent", frappe.session.user, "default_medium", medium)
+
+	return get_user_default_calling_medium()
+
+
+@frappe.whitelist()
+def add_note_to_call_log(call_sid, note):
+	"""Add/Update note to call log based on call sid."""
+	_note = None
+	if not note.get("name"):
+		_note = frappe.get_doc(
+			{
+				"doctype": "FCRM Note",
+				"title": note.get("title", "Call Note"),
+				"content": note.get("content"),
+			}
+		).insert(ignore_permissions=True)
+	else:
+		_note = frappe.set_value("FCRM Note", note.get("name"), "content", note.get("content"))
+
+	call_log = frappe.get_cached_doc("CRM Call Log", call_sid)
+	call_log.link_with_reference_doc("FCRM Note", _note.name)
+	call_log.save(ignore_permissions=True)
+
+	return _note
+
+
+@frappe.whitelist()
+def add_task_to_call_log(call_sid, task):
+	"""Add/Update task to call log based on call sid."""
+	_task = None
+	if not task.get("name"):
+		_task = frappe.get_doc(
+			{
+				"doctype": "CRM Task",
+				"title": task.get("title"),
+				"description": task.get("description"),
+				"assigned_to": task.get("assigned_to"),
+				"due_date": task.get("due_date"),
+				"status": task.get("status"),
+				"priority": task.get("priority"),
+			}
+		).insert(ignore_permissions=True)
+	else:
+		_task = frappe.get_doc("CRM Task", task.get("name"))
+		_task.update(
+			{
+				"title": task.get("title"),
+				"description": task.get("description"),
+				"assigned_to": task.get("assigned_to"),
+				"due_date": task.get("due_date"),
+				"status": task.get("status"),
+				"priority": task.get("priority"),
+			}
+		)
+		_task.save(ignore_permissions=True)
+
+	call_log = frappe.get_doc("CRM Call Log", call_sid)
+	call_log.link_with_reference_doc("CRM Task", _task.name)
+	call_log.save(ignore_permissions=True)
+
+	return _task
+
+
+@frappe.whitelist()
+def get_contact_by_phone_number(phone_number):
+	"""Get contact by phone number."""
+	number = parse_phone_number(phone_number)
+
+	if number.get("is_valid"):
+		return get_contact(number.get("national_number"), number.get("country"))
+	else:
+		return get_contact(phone_number, number.get("country"), exact_match=True)
+
+
+def get_contact(phone_number, country="IN", exact_match=False):
+	if not phone_number:
+		return {"mobile_no": phone_number}
+
+	cleaned_number = (
+		phone_number.strip()
+		.replace(" ", "")
+		.replace("-", "")
+		.replace("(", "")
+		.replace(")", "")
+		.replace("+", "")
+	)
+
+	# Check if the number is associated with a contact
+	Contact = frappe.qb.DocType("Contact")
+	normalized_phone = Replace(
+		Replace(Replace(Replace(Replace(Contact.mobile_no, " ", ""), "-", ""), "(", ""), ")", ""), "+", ""
+	)
+
+	query = (
+		frappe.qb.from_(Contact)
+		.select(Contact.name, Contact.full_name, Contact.image, Contact.mobile_no)
+		.where(normalized_phone.like(f"%{cleaned_number}%"))
+		.orderby("modified", order=Order.desc)
+	)
+	contacts = query.run(as_dict=True)
+
+	if len(contacts):
+		# Check if the contact is associated with a deal
+		for contact in contacts:
+			if frappe.db.exists("CRM Contacts", {"contact": contact.name, "is_primary": 1}):
+				deal = frappe.db.get_value(
+					"CRM Contacts", {"contact": contact.name, "is_primary": 1}, "parent"
+				)
+				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, country, validate=not exact_match):
+			return contacts[0]
+
+	# Else, Check if the number is associated with a lead
+	Lead = frappe.qb.DocType("CRM Lead")
+	normalized_phone = Replace(
+		Replace(Replace(Replace(Replace(Lead.mobile_no, " ", ""), "-", ""), "(", ""), ")", ""), "+", ""
+	)
+
+	query = (
+		frappe.qb.from_(Lead)
+		.select(Lead.name, Lead.lead_name, Lead.image, Lead.mobile_no)
+		.where(Lead.converted == 0)
+		.where(normalized_phone.like(f"%{cleaned_number}%"))
+		.orderby("modified", order=Order.desc)
+	)
+	leads = query.run(as_dict=True)
+
+	if len(leads):
+		for lead in leads:
+			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
+
+	return {"mobile_no": phone_number}

crm/integrations/exotel/handler.py

@@ -0,0 +1,286 @@
+import bleach
+import frappe
+import requests
+from frappe import _
+from frappe.integrations.utils import create_request_log
+
+from crm.integrations.api import get_contact_by_phone_number
+
+# Endpoints for webhook
+
+# Incoming Call:
+# <site>/api/method/crm.integrations.exotel.handler.handle_request?key=<exotel-webhook-verify-token>
+
+# Exotel Reference:
+# https://developer.exotel.com/api/
+# https://support.exotel.com/support/solutions/articles/48283-working-with-passthru-applet
+
+
+# Incoming Call
+@frappe.whitelist(allow_guest=True)
+def handle_request(**kwargs):
+	validate_request()
+	if not is_integration_enabled():
+		return
+
+	request_log = create_request_log(
+		kwargs,
+		request_description="Exotel Call",
+		service_name="Exotel",
+		request_headers=frappe.request.headers,
+		is_remote_request=1,
+	)
+
+	try:
+		request_log.status = "Completed"
+		exotel_settings = get_exotel_settings()
+		if not exotel_settings.enabled:
+			return
+
+		call_payload = kwargs
+
+		frappe.publish_realtime("exotel_call", call_payload)
+		status = call_payload.get("Status")
+		if status == "free":
+			return
+
+		if call_log := get_call_log(call_payload):
+			update_call_log(call_payload, call_log=call_log)
+		else:
+			create_call_log(
+				call_id=call_payload.get("CallSid"),
+				from_number=call_payload.get("CallFrom"),
+				to_number=call_payload.get("DialWhomNumber"),
+				medium=call_payload.get("To"),
+				status=get_call_log_status(call_payload),
+				agent=call_payload.get("AgentEmail"),
+			)
+	except Exception:
+		request_log.status = "Failed"
+		request_log.error = frappe.get_traceback()
+		frappe.db.rollback()
+		frappe.log_error(title="Error while creating/updating call record")
+		frappe.db.commit()
+	finally:
+		request_log.save(ignore_permissions=True)
+		frappe.db.commit()
+
+
+# Outgoing Call
+@frappe.whitelist()
+def make_a_call(to_number, from_number=None, caller_id=None):
+	if not is_integration_enabled():
+		frappe.throw(_("Please setup Exotel intergration"), title=_("Integration Not Enabled"))
+
+	endpoint = get_exotel_endpoint("Calls/connect.json?details=true")
+
+	if not from_number:
+		from_number = frappe.get_value("CRM Telephony Agent", {"user": frappe.session.user}, "mobile_no")
+
+	if not caller_id:
+		caller_id = frappe.get_value("CRM Telephony Agent", {"user": frappe.session.user}, "exotel_number")
+
+	if not caller_id:
+		frappe.throw(
+			_("You do not have Exotel Number set in your Telephony Agent"), title=_("Exotel Number Missing")
+		)
+
+	if caller_id and caller_id not in get_all_exophones():
+		frappe.throw(_("Exotel Number {0} is not valid").format(caller_id), title=_("Invalid Exotel Number"))
+
+	if not from_number:
+		frappe.throw(
+			_("You do not have mobile number set in your Telephony Agent"), title=_("Mobile Number Missing")
+		)
+
+	record_call = frappe.db.get_single_value("CRM Exotel Settings", "record_call")
+
+	try:
+		response = requests.post(
+			endpoint,
+			data={
+				"From": from_number,
+				"To": to_number,
+				"CallerId": caller_id,
+				"Record": "true" if record_call else "false",
+				"StatusCallback": get_status_updater_url(),
+				"StatusCallbackEvents[0]": "terminal",
+				"StatusCallbackEvents[1]": "answered",
+			},
+		)
+		response.raise_for_status()
+	except requests.exceptions.HTTPError:
+		if exc := response.json().get("RestException"):
+			frappe.throw(bleach.linkify(exc.get("Message")), title=_("Exotel Exception"))
+	else:
+		res = response.json()
+		call_payload = res.get("Call", {})
+
+		create_call_log(
+			call_id=call_payload.get("Sid"),
+			from_number=call_payload.get("From"),
+			to_number=call_payload.get("To"),
+			medium=call_payload.get("PhoneNumberSid"),
+			call_type="Outgoing",
+			agent=frappe.session.user,
+		)
+
+	call_details = response.json().get("Call", {})
+	call_details["CallSid"] = call_details.get("Sid", "")
+	return call_details
+
+
+def get_exotel_endpoint(action=None, version="v1"):
+	settings = get_exotel_settings()
+	return "https://{api_key}:{api_token}@{subdomain}/{version}/Accounts/{sid}/{action}".format(
+		api_key=settings.api_key,
+		api_token=settings.get_password("api_token"),
+		subdomain=settings.subdomain,
+		version=version,
+		sid=settings.account_sid,
+		action=action,
+	)
+
+
+def get_all_exophones():
+	endpoint = get_exotel_endpoint("IncomingPhoneNumbers", "v2_beta")
+	response = requests.get(endpoint)
+	return [phone.get("friendly_name") for phone in response.json().get("incoming_phone_numbers", [])]
+
+
+def get_status_updater_url():
+	from frappe.utils.data import get_url
+
+	webhook_verify_token = frappe.db.get_single_value("CRM Exotel Settings", "webhook_verify_token")
+	return get_url(f"api/method/crm.integrations.exotel.handler.handle_request?key={webhook_verify_token}")
+
+
+def get_exotel_settings():
+	return frappe.get_single("CRM Exotel Settings")
+
+
+def validate_request():
+	# workaround security since exotel does not support request signature
+	# /api/method/<exotel-integration-method>?key=<exotel-webhook=verify-token>
+	webhook_verify_token = frappe.db.get_single_value("CRM Exotel Settings", "webhook_verify_token")
+	key = frappe.request.args.get("key")
+	is_valid = key and key == webhook_verify_token
+
+	if not is_valid:
+		frappe.throw(_("Unauthorized request"), exc=frappe.PermissionError)
+
+
+@frappe.whitelist()
+def is_integration_enabled():
+	return frappe.db.get_single_value("CRM Exotel Settings", "enabled", True)
+
+
+# Call Log Functions
+def create_call_log(
+	call_id,
+	from_number,
+	to_number,
+	medium,
+	agent,
+	status="Ringing",
+	call_type="Incoming",
+):
+	call_log = frappe.new_doc("CRM Call Log")
+	call_log.id = call_id
+	call_log.to = to_number
+	call_log.medium = medium
+	call_log.type = call_type
+	call_log.status = status
+	call_log.telephony_medium = "Exotel"
+	setattr(call_log, "from", from_number)
+
+	if call_type == "Incoming":
+		call_log.receiver = agent
+	else:
+		call_log.caller = agent
+
+	# link call log with lead/deal
+	contact_number = from_number if call_type == "Incoming" else to_number
+	link(contact_number, call_log)
+
+	call_log.save(ignore_permissions=True)
+	frappe.db.commit()
+	return call_log
+
+
+def link(contact_number, call_log):
+	contact = get_contact_by_phone_number(contact_number)
+	if contact.get("name"):
+		doctype = "Contact"
+		docname = contact.get("name")
+		if contact.get("lead"):
+			doctype = "CRM Lead"
+			docname = contact.get("lead")
+		elif contact.get("deal"):
+			doctype = "CRM Deal"
+			docname = contact.get("deal")
+		call_log.link_with_reference_doc(doctype, docname)
+
+
+def get_call_log(call_payload):
+	call_log_id = call_payload.get("CallSid")
+	if frappe.db.exists("CRM Call Log", call_log_id):
+		return frappe.get_doc("CRM Call Log", call_log_id)
+
+
+def get_call_log_status(call_payload, direction="inbound"):
+	if direction == "outbound-api" or direction == "outbound-dial":
+		status = call_payload.get("Status")
+		if status == "completed":
+			return "Completed"
+		elif status == "in-progress":
+			return "In Progress"
+		elif status == "busy":
+			return "Ringing"
+		elif status == "no-answer":
+			return "No Answer"
+		elif status == "failed":
+			return "Failed"
+
+	call_type = call_payload.get("CallType")
+	status = call_payload.get("DialCallStatus") or call_payload.get("Status")
+
+	if call_type == "incomplete" and status == "no-answer":
+		status = "No Answer"
+	elif call_type == "client-hangup" and status == "canceled":
+		status = "Canceled"
+	elif call_type == "incomplete" and status == "failed":
+		status = "Failed"
+	elif call_type == "completed":
+		status = "Completed"
+	elif status == "busy":
+		status = "Ringing"
+
+	return status
+
+
+def update_call_log(call_payload, status="Ringing", call_log=None):
+	direction = call_payload.get("Direction")
+	call_log = call_log or get_call_log(call_payload)
+	status = get_call_log_status(call_payload, direction)
+	try:
+		if call_log:
+			call_log.status = status
+			# resetting this because call might be redirected to other number
+			call_log.to = call_payload.get("DialWhomNumber") or call_payload.get("To")
+			call_log.duration = (
+				call_payload.get("DialCallDuration") or call_payload.get("ConversationDuration") or 0
+			)
+			call_log.recording_url = call_payload.get("RecordingUrl") if call_payload.get("RecordingUrl") else ""
+			call_log.start_time = call_payload.get("StartTime")
+			call_log.end_time = call_payload.get("EndTime")
+
+			if direction == "incoming" and call_payload.get("AgentEmail"):
+				call_log.receiver = call_payload.get("AgentEmail")
+
+			call_log.save(ignore_permissions=True)
+			frappe.db.commit()
+			return call_log
+	except Exception:
+		frappe.log_error(title="Error while updating call record")
+		frappe.db.commit()