chore: Persian translations

This reverts commit 816bc700ede63c2e9d12f70cea1e90c26f11acc1.

.gitignore

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

.mergify.yml

@@ -0,0 +1,45 @@
+pull_request_rules:
+    - name: Auto-close PRs on stable branch
+      conditions:
+          - and:
+                - and:
+                      - author!=shariquerik
+                      - author!=frappe-pr-bot
+                      - author!=mergify[bot]
+                - or:
+                      - base=main
+      actions:
+          close:
+          comment:
+              message: |
+                  @{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on develop branch.
+
+    - name: backport to develop
+      conditions:
+          - label="backport develop"
+      actions:
+          backport:
+              branches:
+                  - develop
+              assignees:
+                  - "{{ author }}"
+
+    - name: backport to main-hotfix
+      conditions:
+          - label="backport main-hotfix"
+      actions:
+          backport:
+              branches:
+                  - main-hotfix
+              assignees:
+                  - "{{ author }}"
+
+    - name: backport to main
+      conditions:
+          - label="backport main"
+      actions:
+          backport:
+              branches:
+                  - main
+              assignees:
+                  - "{{ author }}"

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>
@@ -84,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
@@ -181,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/api/__init__.py

@@ -1,9 +1,10 @@
-from bs4 import BeautifulSoup
 import frappe
-from frappe.translate import get_all_translations
-from frappe.utils import validate_email_address, split_emails, cstr
-from frappe.utils.telemetry import POSTHOG_HOST_FIELD, POSTHOG_PROJECT_FIELD
+from bs4 import BeautifulSoup
 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.modules import get_modules_from_all_apps_for_user
+from frappe.utils.telemetry import POSTHOG_HOST_FIELD, POSTHOG_PROJECT_FIELD
 
 
 @frappe.whitelist(allow_guest=True)
@@ -63,9 +64,14 @@ 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
+		role in ["System Manager", "Sales User", "Sales Manager"] for role in roles
 	):
 		return True
 
@@ -93,9 +99,14 @@ def accept_invitation(key: str | None = None):
 
 @frappe.whitelist()
 def invite_by_email(emails: str, role: str):
-	frappe.only_for("Sales Manager")
+	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)
 	email_list = split_emails(email_string)
 	if not email_list:
@@ -103,7 +114,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",
 	)
 
@@ -112,6 +126,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):

crm/api/activities.py

@@ -124,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,
@@ -255,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,

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

@@ -14,32 +14,16 @@ 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
-			deal.mobile_no = doc.mobile_no
-			deal.save(ignore_permissions=True)
-
-
-@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"]
+			frappe.db.set_value(
+				"CRM Deal",
+				linked_deal.parent,
+				{
+					"email": doc.email_id,
+					"mobile_no": doc.mobile_no,
+				},
 			)
-	contact["phone_nos"] = frappe.get_all(
-		"Contact Phone", filters={"parent": name}, fields=["name", "phone", "is_primary_mobile_no"]
-	)
-	return contact
 
 
 @frappe.whitelist()

crm/api/doc.py

@@ -3,6 +3,7 @@ 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
@@ -10,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()
@@ -418,16 +420,23 @@ def get_data(
 				rows.append(field)
 
 		for kc in kanban_columns:
-			column_filters = {column_field: kc.get("name")}
+			# Start with base filters
+			column_filters = []
+
+			# Convert and add the main filters first
+			if filters:
+				base_filters = convert_filter_to_tuple(doctype, filters)
+				column_filters.extend(base_filters)
+
+			# Add the column-specific filter
+			if column_field and kc.get("name"):
+				column_filters.append([doctype, column_field, "=", kc.get("name")])
+
 			order = kc.get("order")
-			if (column_field in filters and filters.get(column_field) != kc.get("name")) or kc.get("delete"):
+			if kc.get("delete"):
 				column_data = []
 			else:
-				column_filters.update(filters.copy())
-				page_length = 20
-
-				if kc.get("page_length"):
-					page_length = kc.get("page_length")
+				page_length = kc.get("page_length", 20)
 
 				if order:
 					column_data = get_records_based_on_order(
@@ -437,26 +446,20 @@ def get_data(
 					column_data = frappe.get_list(
 						doctype,
 						fields=rows,
-						filters=convert_filter_to_tuple(doctype, column_filters),
+						filters=column_filters,
 						order_by=order_by,
 						page_length=page_length,
 					)
 
-				new_filters = filters.copy()
-				new_filters.update({column_field: kc.get("name")})
-
 				all_count = frappe.get_list(
 					doctype,
-					filters=convert_filter_to_tuple(doctype, new_filters),
+					filters=column_filters,
 					fields="count(*) as total_count",
 				)[0].total_count
 
 				kc["all_count"] = all_count
 				kc["count"] = len(column_data)
 
-				for d in column_data:
-					getCounts(d, doctype)
-
 			if order:
 				column_data = sorted(
 					column_data,
@@ -658,6 +661,25 @@ def get_fields_meta(doctype, restricted_fieldtypes=None, as_array=False, only_re
 	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",
@@ -725,3 +747,167 @@ 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/session.py

@@ -23,11 +23,32 @@ def get_users():
 		if frappe.session.user == user.name:
 			user.session_user = True
 
-		user.is_manager = "Sales Manager" in frappe.get_roles(user.name) or user.name == "Administrator"
+		user.roles = frappe.get_roles(user.name)
 
-		user.is_agent = frappe.db.exists("CRM Telephony Agent", {"user": user.name})
+		user.role = ""
 
-	return users
+		if "System Manager" in user.roles:
+			user.role = "System Manager"
+		elif "Sales Manager" in user.roles:
+			user.role = "Sales Manager"
+		elif "Sales User" in user.roles:
+			user.role = "Sales User"
+		elif "Guest" in user.roles:
+			user.role = "Guest"
+
+		if frappe.session.user == user.name:
+			user.session_user = True
+
+		user.is_telephony_agent = frappe.db.exists("CRM Telephony Agent", {"user": user.name})
+
+	crm_users = []
+
+	# crm users are users with role Sales User or Sales Manager
+	for user in users:
+		if "Sales User" in user.roles or "Sales Manager" in user.roles:
+			crm_users.append(user)
+
+	return users, crm_users
 
 
 @frappe.whitelist()

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,28 +1,19 @@
 import frappe
 from frappe import _
+
 from crm.fcrm.doctype.crm_notification.crm_notification import notify_user
 
 
 def after_insert(doc, method):
-    if (
-        doc.reference_type in ["CRM Lead", "CRM Deal"]
-        and doc.reference_name
-        and doc.allocated_to
-    ):
+	if doc.reference_type in ["CRM Lead", "CRM Deal"] and doc.reference_name and doc.allocated_to:
 		fieldname = "lead_owner" if doc.reference_type == "CRM Lead" else "deal_owner"
-        lead_owner = frappe.db.get_value(
-            doc.reference_type, doc.reference_name, fieldname
-        )
-        if not lead_owner:
+		owner = frappe.db.get_value(doc.reference_type, doc.reference_name, fieldname)
+		if not owner:
 			frappe.db.set_value(
-                doc.reference_type, doc.reference_name, fieldname, doc.allocated_to
+				doc.reference_type, doc.reference_name, fieldname, doc.allocated_to, update_modified=False
 			)
 
-    if (
-        doc.reference_type in ["CRM Lead", "CRM Deal", "CRM Task"]
-        and doc.reference_name
-        and doc.allocated_to
-    ):
+	if doc.reference_type in ["CRM Lead", "CRM Deal", "CRM Task"] and doc.reference_name and doc.allocated_to:
 		notify_assigned_user(doc)
 
 
@@ -47,9 +38,7 @@ def notify_assigned_user(doc, is_cancelled=False):
 			doc.reference_type, doc.reference_name, owner
 		)
 		if is_cancelled
-        else _("{0} assigned a {1} {2} to you").format(
-            owner, doc.reference_type, doc.reference_name
-        )
+		else _("{0} assigned a {1} {2} to you").format(owner, doc.reference_type, doc.reference_name)
 	)
 
 	redirect_to_doctype, redirect_to_name = get_redirect_to_doc(doc)

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/whatsapp.py

@@ -10,6 +10,13 @@ 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"))
+		if name != None:
+			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
 
@@ -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">
@@ -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/fcrm/doctype/crm_call_log/crm_call_log.json

@@ -41,13 +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"
+   "options": "Initiated\nRinging\nIn Progress\nCompleted\nFailed\nBusy\nNo Answer\nQueued\nCanceled",
+   "reqd": 1
   },
   {
    "fieldname": "start_time",
@@ -69,13 +71,15 @@
    "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",
@@ -153,7 +157,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-01-22 17:57:59.289548",
+ "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

@@ -190,11 +190,20 @@ def get_call_log(name):
 
 
 @frappe.whitelist()
-def create_lead_from_call_log(call_log):
+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.mobile_no = call_log.get("from")
-	lead.lead_owner = frappe.session.user
+	lead_details = frappe.parse_json(lead_details or "{}")
+
+	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)
 
 	# link call log with lead

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):
@@ -30,24 +17,12 @@ def get_deal_contacts(name):
 		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),
-			"mobile_no": get_primary_mobile_no(contact),
+			"email": contact.email_id,
+			"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,6 +464,7 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "show_title_field_in_link": 1,
  "sort_field": "modified",
  "sort_order": "DESC",

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 (
-	add_status_change_log,
-)
+from crm.fcrm.doctype.crm_status_change_log.crm_status_change_log import 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",
-  "position"
+  "type",
+  "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,6 +90,7 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []

crm/fcrm/doctype/crm_fields_layout/crm_fields_layout.py

@@ -27,7 +27,9 @@ def get_fields_layout(doctype: str, type: str, parent_doctype: str | None = None
 	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,8 +83,18 @@
    "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_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,6 +106,7 @@
    "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,

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,6 +81,7 @@
   }
  ],
  "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

@@ -0,0 +1,9 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+# import frappe
+from frappe.model.document import Document
+
+
+class CRMLostReason(Document):
+	pass

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_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,6 +118,7 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": []

crm/fcrm/doctype/crm_organization/crm_organization.py

@@ -4,41 +4,55 @@
 import frappe
 from frappe.model.document import Document
 
+from crm.fcrm.doctype.fcrm_settings.fcrm_settings import get_exchange_rate
+
 
 class CRMOrganization(Document):
+	def validate(self):
+		self.update_exchange_rate()
+
+	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 = [
 			{
-					'label': 'Organization',
-					'type': 'Data',
-					'key': 'organization_name',
-					'width': '16rem',
+				"label": "Organization",
+				"type": "Data",
+				"key": "organization_name",
+				"width": "16rem",
 			},
 			{
-					'label': 'Website',
-					'type': 'Data',
-					'key': 'website',
-					'width': '14rem',
+				"label": "Website",
+				"type": "Data",
+				"key": "website",
+				"width": "14rem",
 			},
 			{
-					'label': 'Industry',
-					'type': 'Link',
-					'key': 'industry',
-					'options': 'CRM Industry',
-					'width': '14rem',
+				"label": "Industry",
+				"type": "Link",
+				"key": "industry",
+				"options": "CRM Industry",
+				"width": "14rem",
 			},
 			{
-					'label': 'Annual Revenue',
-					'type': 'Currency',
-					'key': 'annual_revenue',
-					'width': '14rem',
+				"label": "Annual Revenue",
+				"type": "Currency",
+				"key": "annual_revenue",
+				"width": "14rem",
 			},
 			{
-					'label': 'Last Modified',
-					'type': 'Datetime',
-					'key': 'modified',
-					'width': '8rem',
+				"label": "Last Modified",
+				"type": "Datetime",
+				"key": "modified",
+				"width": "8rem",
 			},
 		]
 		rows = [
@@ -51,4 +65,4 @@ class CRMOrganization(Document):
 			"annual_revenue",
 			"modified",
 		]
-			return {'columns': columns, 'rows': rows}
+		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_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,17 +63,30 @@
    "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(
+				"status_change_log",
+				{
 					"from": previous_status,
+					"from_type": previous_status_type or "",
 					"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(
+		"status_change_log",
+		{
 			"from": doc.status,
+			"from_type": to_status_type or "",
 			"to": "",
+			"to_type": "",
 			"from_date": datetime.now(),
 			"to_date": "",
 			"log_owner": frappe.session.user,
-	})
+		},
+	)

crm/fcrm/doctype/crm_twilio_settings/crm_twilio_settings.json

@@ -63,8 +63,7 @@
    "fieldname": "twiml_sid",
    "fieldtype": "Data",
    "label": "TwiML SID",
-   "permlevel": 1,
-   "read_only": 1
+   "permlevel": 1
   },
   {
    "fieldname": "section_break_ssqj",
@@ -105,7 +104,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2025-01-15 19:35:13.406254",
+ "modified": "2025-08-19 13:36:19.823197",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "CRM Twilio Settings",
@@ -152,6 +151,7 @@
    "write": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "modified",
  "sort_order": "DESC",
  "states": [],

crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.py

@@ -128,14 +128,32 @@ def get_quotation_url(crm_deal, 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")
-		return f"{quotation_url}/new?quotation_to=CRM Deal&crm_deal={crm_deal}&party_name={crm_deal}&company={erpnext_crm_settings.erpnext_company}&contact_person={contact}&customer_address={address}"
+		base_url = f"{get_url_to_list('Quotation')}/new"
+		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}&contact_person={contact}&customer_address={address}"
+		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):
@@ -264,7 +282,7 @@ def create_customer_in_remote_site(customer, erpnext_crm_settings):
 @frappe.whitelist()
 def get_crm_form_script():
 	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": "2025-02-20 12:38:38.088477",
+ "modified": "2025-09-16 17:33:26.406549",
  "modified_by": "Administrator",
  "module": "FCRM",
  "name": "FCRM Settings",
@@ -95,6 +152,7 @@
    "share": 1
   }
  ],
+ "row_format": "Dynamic",
  "sort_field": "creation",
  "sort_order": "DESC",
  "states": []

crm/fcrm/doctype/fcrm_settings/fcrm_settings.py

@@ -2,7 +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
@@ -15,6 +17,8 @@ class FCRMSettings(Document):
 
 	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"):
@@ -24,8 +28,53 @@ class FCRMSettings(Document):
 		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():
@@ -51,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/helpdesk_crm_settings/helpdesk_crm_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("Helpdesk CRM Settings", {
+// 	refresh(frm) {
+
+// 	},
+// });

crm/fcrm/doctype/helpdesk_crm_settings/helpdesk_crm_settings.json

@@ -0,0 +1,102 @@
+{
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2025-08-18 17:25:49.638398",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "enabled",
+  "column_break_idaw",
+  "is_helpdesk_in_different_site",
+  "helpdesk_site_url",
+  "helpdesk_site_apis_section",
+  "api_key",
+  "column_break_tqsm",
+  "api_secret"
+ ],
+ "fields": [
+  {
+   "default": "0",
+   "fieldname": "enabled",
+   "fieldtype": "Check",
+   "label": "Enabled"
+  },
+  {
+   "fieldname": "column_break_idaw",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "depends_on": "enabled",
+   "fieldname": "is_helpdesk_in_different_site",
+   "fieldtype": "Check",
+   "label": "Is Helpdesk installed on a different site?"
+  },
+  {
+   "depends_on": "eval:doc.enabled && doc.is_helpdesk_in_different_site",
+   "fieldname": "helpdesk_site_url",
+   "fieldtype": "Data",
+   "label": "Helpdesk Site URL",
+   "mandatory_depends_on": "is_helpdesk_in_different_site"
+  },
+  {
+   "depends_on": "enabled",
+   "fieldname": "helpdesk_site_apis_section",
+   "fieldtype": "Section Break",
+   "label": "Helpdesk Site API's"
+  },
+  {
+   "depends_on": "eval:doc.enabled && doc.is_helpdesk_in_different_site",
+   "fieldname": "api_key",
+   "fieldtype": "Data",
+   "label": "API Key",
+   "mandatory_depends_on": "is_helpdesk_in_different_site"
+  },
+  {
+   "fieldname": "column_break_tqsm",
+   "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "eval:doc.enabled && doc.is_helpdesk_in_different_site",
+   "fieldname": "api_secret",
+   "fieldtype": "Password",
+   "label": "API Secret",
+   "mandatory_depends_on": "is_helpdesk_in_different_site"
+  }
+ ],
+ "grid_page_length": 50,
+ "index_web_pages_for_search": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2025-08-18 17:33:38.616328",
+ "modified_by": "Administrator",
+ "module": "FCRM",
+ "name": "Helpdesk CRM 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
+  }
+ ],
+ "row_format": "Dynamic",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}

crm/fcrm/doctype/helpdesk_crm_settings/helpdesk_crm_settings.py

@@ -0,0 +1,178 @@
+# 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 HelpdeskCRMSettings(Document):
+	def validate(self):
+		if self.enabled:
+			self.validate_if_helpdesk_installed()
+			self.create_helpdesk_script()
+
+	def validate_if_helpdesk_installed(self):
+		if not self.is_helpdesk_in_different_site:
+			if "helpdesk" not in frappe.get_installed_apps():
+				frappe.throw(_("Helpdesk is not installed in the current site"))
+
+	def create_helpdesk_script(self):
+		if not frappe.db.exists("CRM Form Script", "Helpdesk Integration Script"):
+			script = get_helpdesk_script()
+			frappe.get_doc(
+				{
+					"doctype": "CRM Form Script",
+					"name": "Helpdesk Integration Script",
+					"dt": "CRM Deal",
+					"view": "Form",
+					"script": script,
+					"enabled": 1,
+					"is_standard": 1,
+				}
+			).insert()
+
+
+@frappe.whitelist()
+def create_customer_in_helpdesk(name, email):
+	helpdesk_crm_settings = frappe.get_single("Helpdesk CRM Settings")
+	if not helpdesk_crm_settings.enabled:
+		frappe.throw(_("Helpdesk is not integrated with the CRM"))
+
+	if not helpdesk_crm_settings.is_helpdesk_in_different_site:
+		# from helpdesk.integrations.crm.api import create_customer
+		return create_customer(name, email)
+
+
+def get_helpdesk_script():
+	return """class CRMDeal {
+    onLoad() {
+        this.actions.push(
+            {
+                group: "Helpdesk",
+                hideLabel: true,
+                items: [
+                    {
+                        label: "Create customer in Helpdesk",
+                        onClick: () => {
+                            call('crm.fcrm.doctype.helpdesk_crm_settings.helpdesk_crm_settings.create_customer_in_helpdesk', {
+                                name: this.doc.organization,
+                                email: this.doc.email
+                            }).then((a) => {
+                                toast.success("Customer created successfully, " + a.customer)
+                            })
+                        }
+                    }
+                ]
+            }
+        )
+    }
+}"""
+
+# Helpdesk methods TODO: move to helpdesk.integrations.crm.api
+def create_customer(name, email):
+	customer = frappe.db.exists("HD Customer", name)
+	if not customer:
+		customer = frappe.get_doc(
+			{
+				"doctype": "HD Customer",
+				"customer_name": name,
+			}
+		)
+		customer.insert(ignore_permissions=True, ignore_if_duplicate=True)
+	else:
+		customer = frappe.get_doc("HD Customer", customer)
+
+	contact = frappe.db.exists("Contact", {"email_id": email})
+	if contact:
+		contact = frappe.get_doc("Contact", contact)
+		contact.append(
+			"links", {"link_doctype": "HD Customer", "link_name": customer.name}
+		)
+		contact.save(ignore_permissions=True)
+	else:
+		contact = frappe.get_doc(
+			{
+				"doctype": "Contact",
+				"first_name": email.split("@")[0],
+				"email_ids": [{"email_id": email, "is_primary": 1}],
+				"links": [{"link_doctype": "HD Customer", "link_name": customer.name}],
+			}
+		)
+		contact.insert(ignore_permissions=True)
+
+	if not frappe.db.exists("User", contact.email_id):
+		invite_user(contact.name)
+	else:
+		base_url = frappe.utils.get_url() + "/helpdesk"
+		frappe.sendmail(
+			recipients=[contact.email_id],
+			subject="Welcome existing user to Helpdesk",
+			message=f"""
+				<h1>Hello,</h1>
+				<button>{base_url}</button>
+			""",
+			now=True,
+		)
+
+	return {"customer": customer.name, "contact": contact.name}
+
+
+def invite_user(contact: str):
+	contact = frappe.get_doc("Contact", contact)
+	contact.check_permission()
+
+	if not contact.email_id:
+		frappe.throw(_("Please set Email Address"))
+
+	user = frappe.get_doc(
+		{
+			"doctype": "User",
+			"first_name": contact.first_name,
+			"last_name": contact.last_name,
+			"email": contact.email_id,
+			"user_type": "Website User",
+			"send_welcome_email": 0
+		}
+	).insert()
+
+	contact.user = user.name
+	contact.save(ignore_permissions=True)
+
+	send_welcome_mail_to_user(user)
+	return user.name
+
+
+def send_welcome_mail_to_user(user):
+	from frappe.utils import get_url
+	from frappe.utils.user import get_user_fullname
+
+	link = user.reset_password()
+
+	frappe.cache.hset("redirect_after_login", user.name, "/helpdesk")
+
+	site_url = get_url()
+	subject = _("Welcome to Helpdesk")
+
+	created_by = get_user_fullname(frappe.session["user"])
+	if created_by == "Guest":
+		created_by = "Administrator"
+
+	args = {
+		"first_name": user.first_name or user.last_name or "user",
+		"last_name": user.last_name,
+		"user": user.name,
+		"title": subject,
+		"login_url": get_url(),
+		"created_by": created_by,
+		"site_url": site_url,
+		"link": link
+	}
+
+	frappe.sendmail(
+		recipients=[user.email],
+		subject=subject,
+		template="helpdesk_invitation",
+		args=args,
+		now=True,
+	)

crm/fcrm/doctype/helpdesk_crm_settings/test_helpdesk_crm_settings.py

@@ -0,0 +1,21 @@
+# Copyright (c) 2025, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+
+# import frappe
+from frappe.tests import IntegrationTestCase
+
+# 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 IntegrationTestHelpdeskCRMSettings(IntegrationTestCase):
+	"""
+	Integration tests for HelpdeskCRMSettings.
+	Use this class for testing interactions between multiple components.
+	"""
+
+	pass

crm/hooks.py

@@ -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",
@@ -303,6 +287,14 @@ standard_dropdown_items = [
 		"route": "#",
 		"is_standard": 1,
 	},
+	{
+		"name1": "about",
+		"label": "About",
+		"type": "Route",
+		"icon": "info",
+		"route": "#",
+		"is_standard": 1,
+	},
 	{
 		"name1": "separator",
 		"label": "",

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()
 
@@ -170,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}]}]',
 		},
 	}
 
@@ -340,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")
 
@@ -353,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

@@ -35,7 +35,7 @@ def set_default_calling_medium(medium):
 		frappe.get_doc(
 			{
 				"doctype": "CRM Telephony Agent",
-				"agent": frappe.session.user,
+				"user": frappe.session.user,
 				"default_medium": medium,
 			}
 		).insert(ignore_permissions=True)
@@ -110,12 +110,12 @@ def get_contact_by_phone_number(phone_number):
 	number = parse_phone_number(phone_number)
 
 	if number.get("is_valid"):
-		return get_contact(number.get("national_number"))
+		return get_contact(number.get("national_number"), number.get("country"))
 	else:
-		return get_contact(phone_number, exact_match=True)
+		return get_contact(phone_number, number.get("country"), exact_match=True)
 
 
-def get_contact(phone_number, exact_match=False):
+def get_contact(phone_number, country="IN", exact_match=False):
 	if not phone_number:
 		return {"mobile_no": phone_number}
 
@@ -149,11 +149,11 @@ def get_contact(phone_number, exact_match=False):
 				deal = frappe.db.get_value(
 					"CRM Contacts", {"contact": contact.name, "is_primary": 1}, "parent"
 				)
-				if are_same_phone_number(contact.mobile_no, phone_number, validate=not exact_match):
+				if are_same_phone_number(contact.mobile_no, phone_number, country, validate=not exact_match):
 					contact["deal"] = deal
 					return contact
 		# Else, return the first contact
-		if are_same_phone_number(contacts[0].mobile_no, phone_number, validate=not exact_match):
+		if are_same_phone_number(contacts[0].mobile_no, phone_number, country, validate=not exact_match):
 			return contacts[0]
 
 	# Else, Check if the number is associated with a lead
@@ -173,7 +173,7 @@ def get_contact(phone_number, exact_match=False):
 
 	if len(leads):
 		for lead in leads:
-			if are_same_phone_number(lead.mobile_no, phone_number, validate=not exact_match):
+			if are_same_phone_number(lead.mobile_no, phone_number, country, validate=not exact_match):
 				lead["lead"] = lead.name
 				lead["full_name"] = lead.lead_name
 				return lead

crm/integrations/exotel/handler.py

@@ -242,19 +242,18 @@ def get_call_log_status(call_payload, direction="inbound"):
 		elif status == "failed":
 			return "Failed"
 
-	status = call_payload.get("DialCallStatus")
 	call_type = call_payload.get("CallType")
-	dial_call_status = call_payload.get("DialCallStatus")
+	status = call_payload.get("DialCallStatus") or call_payload.get("Status")
 
-	if call_type == "incomplete" and dial_call_status == "no-answer":
+	if call_type == "incomplete" and status == "no-answer":
 		status = "No Answer"
-	elif call_type == "client-hangup" and dial_call_status == "canceled":
+	elif call_type == "client-hangup" and status == "canceled":
 		status = "Canceled"
-	elif call_type == "incomplete" and dial_call_status == "failed":
+	elif call_type == "incomplete" and status == "failed":
 		status = "Failed"
 	elif call_type == "completed":
 		status = "Completed"
-	elif dial_call_status == "busy":
+	elif status == "busy":
 		status = "Ringing"
 
 	return status

crm/patches.txt

@@ -12,3 +12,8 @@ crm.patches.v1_0.create_default_sidebar_fields_layout
 crm.patches.v1_0.update_deal_quick_entry_layout
 crm.patches.v1_0.update_layouts_to_new_format
 crm.patches.v1_0.move_twilio_agent_to_telephony_agent
+crm.patches.v1_0.create_default_scripts # 13-06-2025
+crm.patches.v1_0.update_deal_status_probabilities
+crm.patches.v1_0.update_deal_status_type
+crm.patches.v1_0.create_default_lost_reasons
+crm.patches.v1_0.add_fields_in_assignment_rule

crm/patches/v1_0/add_fields_in_assignment_rule.py

@@ -0,0 +1,9 @@
+from crm.install import (
+	add_assignment_rule_property_setters,
+	create_assignment_rule_custom_fields,
+)
+
+
+def execute():
+	create_assignment_rule_custom_fields()
+	add_assignment_rule_property_setters()

crm/patches/v1_0/create_default_lost_reasons.py

@@ -0,0 +1,5 @@
+from crm.install import add_default_lost_reasons
+
+
+def execute():
+	add_default_lost_reasons()

crm/patches/v1_0/create_default_scripts.py

@@ -0,0 +1,5 @@
+from crm.install import add_default_scripts
+
+
+def execute():
+	add_default_scripts()

crm/patches/v1_0/update_deal_status_probabilities.py

@@ -0,0 +1,24 @@
+import frappe
+
+
+def execute():
+	deal_statuses = frappe.get_all("CRM Deal Status", fields=["name", "probability", "deal_status"])
+
+	for status in deal_statuses:
+		if status.probability is None or status.probability == 0:
+			if status.deal_status == "Qualification":
+				probability = 10
+			elif status.deal_status == "Demo/Making":
+				probability = 25
+			elif status.deal_status == "Proposal/Quotation":
+				probability = 50
+			elif status.deal_status == "Negotiation":
+				probability = 70
+			elif status.deal_status == "Ready to Close":
+				probability = 90
+			elif status.deal_status == "Won":
+				probability = 100
+			else:
+				probability = 0
+
+			frappe.db.set_value("CRM Deal Status", status.name, "probability", probability)

crm/patches/v1_0/update_deal_status_type.py

@@ -0,0 +1,44 @@
+import frappe
+
+
+def execute():
+	deal_statuses = frappe.get_all("CRM Deal Status", fields=["name", "type", "deal_status"])
+
+	openStatuses = ["New", "Open", "Unassigned", "Qualification"]
+	ongoingStatuses = [
+		"Demo/Making",
+		"Proposal/Quotation",
+		"Negotiation",
+		"Ready to Close",
+		"Demo Scheduled",
+		"Follow Up",
+	]
+	onHoldStatuses = ["On Hold", "Paused", "Stalled", "Awaiting Reply"]
+	wonStatuses = ["Won", "Closed Won", "Successful", "Completed"]
+	lostStatuses = [
+		"Lost",
+		"Closed",
+		"Closed Lost",
+		"Junk",
+		"Unqualified",
+		"Disqualified",
+		"Cancelled",
+		"No Response",
+	]
+
+	for status in deal_statuses:
+		if not status.type or status.type is None or status.type == "Open":
+			if status.deal_status in openStatuses:
+				type = "Open"
+			elif status.deal_status in ongoingStatuses:
+				type = "Ongoing"
+			elif status.deal_status in onHoldStatuses:
+				type = "On Hold"
+			elif status.deal_status in wonStatuses:
+				type = "Won"
+			elif status.deal_status in lostStatuses:
+				type = "Lost"
+			else:
+				type = "Ongoing"
+
+			frappe.db.set_value("CRM Deal Status", status.name, "type", type)