vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'develop' of https://github.com/frappe/frappe into fix-auto-assignment

Browse source
This commit is contained in:
Suraj Shetty 2019-04-18 15:54:19 +05:30
commit a9f24267b0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/desk/form/assign_to.py
View file

@ -7,6 +7,7 @@ from __future__ import unicode_literals
import frappe
from frappe import _
from frappe.desk.form.document_follow import follow_document
from frappe.utils import cint
import frappe.share
class DuplicateToDoError(frappe.ValidationError): pass
@ -177,7 +178,7 @@ def notify_assignment(assigned_by, owner, doc_type, doc_name, action='CLOSE',
'notify': notify
}
if arg and arg.get("notify"):
if arg and cint(arg.get("notify")):
_notify(arg)
def _notify(args):

2
frappe/email/inbox.py
View file

@ -145,7 +145,7 @@ def make_lead_from_communication(communication, ignore_communication_links=False
lead_name = None
if doc.sender:
lead_name = frappe.db.get_value("Lead", {"email_id": doc.sender})
if not lead_name and doc.mobile_no:
if not lead_name and doc.phone_no:
lead_name = frappe.db.get_value("Lead", {"mobile_no": doc.phone_no})
if not lead_name:
lead = frappe.get_doc({