diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py index 240dc4255b9..ebe41f734fc 100644 --- a/erpnext/accounts/party.py +++ b/erpnext/accounts/party.py @@ -450,7 +450,9 @@ def get_timeline_data(doctype, name): # fetch and append data from Activity Log data += frappe.db.sql("""select {fields} from `tabActivity Log` - where reference_doctype="{doctype}" and reference_name="{name}" + where (reference_doctype="{doctype}" and reference_name="{name}") + or (timeline_doctype in ("{doctype}") and timeline_name="{name}") + or (reference_doctype in ("Quotation", "Opportunity") and timeline_name="{name}") and status!='Success' and creation > {after} {group_by} order by creation desc """.format(doctype=frappe.db.escape(doctype), name=frappe.db.escape(name), fields=fields,