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

fix: get_activities error will fetching deleted fields

Browse Source
This commit is contained in:
Shariq Ansari 2023-11-24 16:17:44 +05:30
parent 3df38f2111
commit 51c66eed6f
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crm/api/activities.py
View File

@ -16,7 +16,8 @@ def get_activities(name):
def get_deal_activities(name): def get_deal_activities(name):
get_docinfo('', "CRM Deal", name) get_docinfo('', "CRM Deal", name)
docinfo = frappe.response["docinfo"] docinfo = frappe.response["docinfo"]
deal_fields_meta = frappe.get_meta("CRM Deal").fields deal_meta = frappe.get_meta("CRM Deal")
deal_fields = {field.fieldname: {"label": field.label, "options": field.options} for field in deal_meta.fields}
doc = frappe.db.get_values("CRM Deal", name, ["creation", "owner", "lead"])[0] doc = frappe.db.get_values("CRM Deal", name, ["creation", "owner", "lead"])[0]
lead = doc[2] lead = doc[2]
@ -43,14 +44,15 @@ def get_deal_activities(name):
if not data.get("changed"): if not data.get("changed"):
continue continue
field_option = None
if change := data.get("changed")[0]: if change := data.get("changed")[0]:
field_label, field_option = next(((f.label, f.options) for f in deal_fields_meta if f.fieldname == change[0]), None) field = deal_fields.get(change[0], None)
if field_label == "Lead" or (not change[1] and not change[2]): if not field or change[0] == "lead" or (not change[1] and not change[2]):
continue continue
field_label = field.get("label") or change[0]
field_option = field.get("options") or None
activity_type = "changed" activity_type = "changed"
data = { data = {
"field": change[0], "field": change[0],
@ -110,7 +112,8 @@ def get_deal_activities(name):
def get_lead_activities(name): def get_lead_activities(name):
get_docinfo('', "CRM Lead", name) get_docinfo('', "CRM Lead", name)
docinfo = frappe.response["docinfo"] docinfo = frappe.response["docinfo"]
lead_fields_meta = frappe.get_meta("CRM Lead").fields lead_meta = frappe.get_meta("CRM Lead")
lead_fields = {field.fieldname: {"label": field.label, "options": field.options} for field in lead_meta.fields}
doc = frappe.db.get_values("CRM Lead", name, ["creation", "owner"])[0] doc = frappe.db.get_values("CRM Lead", name, ["creation", "owner"])[0]
activities = [{ activities = [{
@ -128,14 +131,15 @@ def get_lead_activities(name):
if not data.get("changed"): if not data.get("changed"):
continue continue
field_option = None
if change := data.get("changed")[0]: if change := data.get("changed")[0]:
field_label, field_option = next(((f.label, f.options) for f in lead_fields_meta if f.fieldname == change[0]), None) field = lead_fields.get(change[0], None)
if field_label == "Converted" or (not change[1] and not change[2]): if not field or change[0] == "converted" or (not change[1] and not change[2]):
continue continue
field_label = field.get("label") or change[0]
field_option = field.get("options") or None
activity_type = "changed" activity_type = "changed"
data = { data = {
"field": change[0], "field": change[0],