From 82cfccab2f4fe20b4c9ad730b8530bbec510b24b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 17 Jul 2019 11:52:35 +0530 Subject: [PATCH] fix: Get user_id of employee instead of name - Remove caching from lead --- erpnext/communication/doctype/call_log/call_log.py | 5 +++-- erpnext/crm/doctype/lead/lead.py | 11 ----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/erpnext/communication/doctype/call_log/call_log.py b/erpnext/communication/doctype/call_log/call_log.py index 8d9e39b4c74..fae649cd508 100644 --- a/erpnext/communication/doctype/call_log/call_log.py +++ b/erpnext/communication/doctype/call_log/call_log.py @@ -46,9 +46,10 @@ def get_employee_email(number): employees = frappe.get_all('Employee', or_filters={ 'phone': ['like', '%{}'.format(number)], - }, limit=1) + 'user_id': ['!=', ''] + }, fields=['user_id'], limit=1) - employee = employees[0].name if employees else None + employee = employees[0].user_id if employees else None frappe.cache().hset('employee_with_number', number, employee) return employee \ No newline at end of file diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py index 15174ef7a28..3ee68447b61 100644 --- a/erpnext/crm/doctype/lead/lead.py +++ b/erpnext/crm/doctype/lead/lead.py @@ -23,13 +23,6 @@ class Lead(SellingController): self.get("__onload").is_customer = customer load_address_and_contact(self) - def on_update(self): - doc = self.get_doc_before_save() - for field in ['mobile_no', 'phone']: - old_number = doc.get(field) - if old_number and old_number != self.get(field): - frappe.cache().hdel('lead_with_number', old_number) - def validate(self): self.set_lead_name() self._prev = frappe._dict({ @@ -241,15 +234,11 @@ def make_lead_from_communication(communication, ignore_communication_links=False def get_lead_with_phone_number(number): if not number: return - lead = frappe.cache().hget('lead_with_number', number) - if lead: return lead - leads = frappe.get_all('Lead', or_filters={ 'phone': ['like', '%{}'.format(number)], 'mobile_no': ['like', '%{}'.format(number)] }, limit=1) lead = leads[0].name if leads else None - frappe.cache().hset('lead_with_number', number, lead) return lead \ No newline at end of file