From 58200182b4013b58669099943e47cec54cdb0291 Mon Sep 17 00:00:00 2001 From: Zarrar Date: Wed, 30 May 2018 11:56:23 +0530 Subject: [PATCH] update timeline data form Activity Log (#14276) Documents updated are stored in Activity Log rather than Communication --- erpnext/accounts/party.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 7fc0f67d28..a09c0a8c64 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -404,10 +404,21 @@ def get_timeline_data(doctype, name): from frappe.desk.form.load import get_communication_data out = {} + fields = 'date(creation), count(name)' + after = add_years(None, -1).strftime('%Y-%m-%d') + group_by='group by date(creation)' + data = get_communication_data(doctype, name, - fields = 'date(creation), count(name)', - after = add_years(None, -1).strftime('%Y-%m-%d'), - group_by='group by date(creation)', as_dict=False) + fields=fields, after=after, group_by=group_by, as_dict=False) + + # fetch and append data from Activity Log + data += frappe.db.sql("""select {fields} + from `tabActivity Log` + where reference_doctype='{doctype}' and reference_name='{name}' + and status!='Success' and creation > {after} + {group_by} order by creation desc + """.format(doctype=doctype, name=name, fields=fields, + group_by=group_by, after=after), as_dict=False) timeline_items = dict(data)