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

fix: table name alias (#17706)

Browse Source
This commit is contained in:
Saurabh 2019-05-23 14:16:56 +05:30 committed by Nabin Hait
parent 45cd60dfb2
commit ba04c3e5bb
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') after = add_years(None, -1).strftime('%Y-%m-%d')
group_by='group by date(creation)' group_by='group by date(creation)'
data = get_communication_data(doctype, name, after=after, group_by='group by date(`tabCommunication`.creation)', data = get_communication_data(doctype, name, after=after, group_by='group by date(creation)',
fields='date(`tabCommunication`.creation), count(`tabCommunication`.name)',as_dict=False) fields='date(C.creation) as creation, count(C.name)',as_dict=False)
# fetch and append data from Activity Log # fetch and append data from Activity Log
data += frappe.db.sql("""select {fields} data += frappe.db.sql("""select {fields}