nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 13:49:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

update timeline data form Activity Log (#14276)

Browse Source 
Documents updated are stored in Activity Log rather than Communication
This commit is contained in:
Zarrar
2018-05-30 11:56:23 +05:30
committed by Rushabh Mehta
parent c2c73ae96a
commit 58200182b4
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
erpnext/accounts/party.py
View File

@@ -404,10 +404,21 @@ def get_timeline_data(doctype, name):
from frappe.desk.form.load import get_communication_data from frappe.desk.form.load import get_communication_data
out = {} 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, data = get_communication_data(doctype, name,
fields = 'date(creation), count(name)', fields=fields, after=after, group_by=group_by, as_dict=False)
after = add_years(None, -1).strftime('%Y-%m-%d'),
group_by='group by date(creation)', 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) timeline_items = dict(data)