test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: removed contact creation/updation code from lead

Browse Source
This commit is contained in:
Shariq Ansari 2023-11-09 12:47:08 +05:30
parent cae4517c7c
commit 8f256843f2
2 changed files with 4 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crm/fcrm/doctype/crm_lead/crm_lead.json
View File

@ -37,9 +37,7 @@
"column_break_sijm",
"mobile_no",
"column_break_sjtw",
"phone",
"section_break_jyxr",
"contacts"
"phone"
],
"fields": [
{
@ -203,16 +201,6 @@
"fieldtype": "Tab Break",
"label": "Contact"
},
{
"fieldname": "contacts",
"fieldtype": "Table",
"label": "Contacts",
"options": "CRM Contacts"
},
{
"fieldname": "section_break_jyxr",
"fieldtype": "Section Break"
},
{
"fieldname": "organization",
"fieldtype": "Link",
@ -231,7 +219,7 @@
"image_field": "image",
"index_web_pages_for_search": 1,
"links": [],
"modified": "2023-11-06 21:53:32.542503",
"modified": "2023-11-09 12:44:18.770076",
"modified_by": "Administrator",
"module": "FCRM",
"name": "CRM Lead",

84
crm/fcrm/doctype/crm_lead/crm_lead.py
View File

@ -14,9 +14,7 @@ class CRMLead(Document):
self.set_lead_name()
self.set_title()
self.validate_email()
if not self.is_new():
self.validate_contact()
def set_full_name(self):
if self.first_name:
self.lead_name = " ".join(
@ -37,7 +35,7 @@ class CRMLead(Document):
def set_title(self):
self.title = self.organization or self.lead_name
def validate_email(self):
if self.email:
if not self.flags.ignore_email_validation:
@ -48,84 +46,6 @@ class CRMLead(Document):
if self.is_new() or not self.image:
self.image = has_gravatar(self.email)
def validate_contact(self):
link = frappe.db.exists("Dynamic Link", {"link_doctype": "CRM Lead", "link_name": self.name})
if link:
for field in ["first_name", "last_name", "email", "mobile_no", "phone", "salutation", "image"]:
if self.has_value_changed(field):
contact = frappe.db.get_value("Dynamic Link", link, "parent")
contact_doc = frappe.get_doc("Contact", contact)
contact_doc.update({
"first_name": self.first_name or self.lead_name,
"last_name": self.last_name,
"salutation": self.salutation,
"image": self.image or "",
})
if self.has_value_changed("email"):
contact_doc.email_ids = []
contact_doc.append("email_ids", {"email_id": self.email, "is_primary": 1})
if self.has_value_changed("phone"):
contact_doc.append("phone_nos", {"phone": self.phone, "is_primary_phone": 1})
if self.has_value_changed("mobile_no"):
contact_doc.phone_nos = []
contact_doc.append("phone_nos", {"phone": self.mobile_no, "is_primary_mobile_no": 1})
contact_doc.save()
break
else:
self.contact_doc = self.create_contact()
self.link_to_contact()
def before_insert(self):
self.contact_doc = None
self.contact_doc = self.create_contact()
def after_insert(self):
self.link_to_contact()
def link_to_contact(self):
# update contact links
if self.contact_doc:
self.contact_doc.append(
"links", {"link_doctype": "CRM Lead", "link_name": self.name, "link_title": self.lead_name}
)
self.contact_doc.save()
def create_contact(self):
if not self.lead_name:
self.set_full_name()
self.set_lead_name()
contact = frappe.new_doc("Contact")
contact.update(
{
"first_name": self.first_name or self.lead_name,
"last_name": self.last_name,
"salutation": self.salutation,
"gender": self.gender,
"designation": self.job_title,
"company_name": self.organization,
"image": self.image or "",
}
)
if self.email:
contact.append("email_ids", {"email_id": self.email, "is_primary": 1})
if self.phone:
contact.append("phone_nos", {"phone": self.phone, "is_primary_phone": 1})
if self.mobile_no:
contact.append("phone_nos", {"phone": self.mobile_no, "is_primary_mobile_no": 1})
contact.insert(ignore_permissions=True)
contact.reload() # load changes by hooks on contact
return contact
@staticmethod
def sort_options():