From f2d89987f532a55183dd9f5d3d08f621a47e5ad5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 3 Aug 2016 16:42:29 +0530 Subject: [PATCH] [minor] ignore email validation if comes from email; --- erpnext/crm/doctype/lead/lead.py | 3 ++- erpnext/crm/doctype/opportunity/opportunity.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py index 0c3652f7eb..e1c3918901 100644 --- a/erpnext/crm/doctype/lead/lead.py +++ b/erpnext/crm/doctype/lead/lead.py @@ -38,7 +38,8 @@ class Lead(SellingController): frappe.throw(_("Campaign Name is required")) if self.email_id: - validate_email_add(self.email_id, True) + if not self.flags.ignore_email_validation: + validate_email_add(self.email_id, True) if self.email_id == self.lead_owner: # Lead Owner cannot be same as the Lead diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py index 0f4d1f4c26..a2a1be2302 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.py +++ b/erpnext/crm/doctype/opportunity/opportunity.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe, json -from frappe.utils import cstr, cint, get_fullname, validate_email_add +from frappe.utils import cstr, cint, get_fullname from frappe import msgprint, _ from frappe.model.mapper import get_mapped_doc from erpnext.setup.utils import get_exchange_rate @@ -43,7 +43,7 @@ class Opportunity(TransactionBase): def make_new_lead_if_required(self): """Set lead against new opportunity""" - if not (self.lead or self.customer) and self.contact_email and validate_email_add(self.contact_email): + if not (self.lead or self.customer) and self.contact_email: lead_name = frappe.db.get_value("Lead", {"email_id": self.contact_email}) if not lead_name: sender_name = get_fullname(self.contact_email) @@ -64,6 +64,7 @@ class Opportunity(TransactionBase): "lead_name": sender_name }) + lead.flags.ignore_email_validation = True lead.insert(ignore_permissions=True) lead_name = lead.name