diff --git a/crm/api/activities.py b/crm/api/activities.py index 3cd9e9f3..ead84b1f 100644 --- a/crm/api/activities.py +++ b/crm/api/activities.py @@ -110,9 +110,10 @@ def get_deal_activities(name): } activities.append(activity) - for communication in docinfo.communications: + for communication in docinfo.communications + docinfo.automated_messages: activity = { "activity_type": "communication", + "communication_type": communication.communication_type, "creation": communication.creation, "data": { "subject": communication.subject, @@ -222,9 +223,10 @@ def get_lead_activities(name): } activities.append(activity) - for communication in docinfo.communications: + for communication in docinfo.communications + docinfo.automated_messages: activity = { "activity_type": "communication", + "communication_type": communication.communication_type, "creation": communication.creation, "data": { "subject": communication.subject, diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue index b0f1e6a8..4a6e9fab 100644 --- a/frontend/src/components/Activities.vue +++ b/frontend/src/components/Activities.vue @@ -386,6 +386,12 @@ {{ __(timeAgo(activity.creation)) }} +
@@ -834,6 +840,7 @@ import { Dropdown, TextEditor, Avatar, + Badge, createResource, call, } from 'frappe-ui'