Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(Communication): Move Timeline DocType and Name to Dynamic Links (#17593)

Browse Source 
* fix: ambigious error
This commit is contained in:
Himanshu 2019-05-20 15:14:07 +05:30 committed by Faris Ansari
parent a1f31e8444
commit 29d4ae6716
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/party.py
View File

@ -463,8 +463,8 @@ def get_timeline_data(doctype, name):
after = add_years(None, -1).strftime('%Y-%m-%d')
group_by='group by date(creation)'
data = get_communication_data(doctype, name,
fields=fields, after=after, group_by=group_by, as_dict=False)
data = get_communication_data(doctype, name, after=after, group_by='group by date(`tabCommunication`.creation)',
fields='date(`tabCommunication`.creation), count(`tabCommunication`.name)',as_dict=False)
# fetch and append data from Activity Log
data += frappe.db.sql("""select {fields}