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/crm/fcrm/doctype/crm_deal/crm_deal.py b/crm/fcrm/doctype/crm_deal/crm_deal.py index e9a1dd61..d303c572 100644 --- a/crm/fcrm/doctype/crm_deal/crm_deal.py +++ b/crm/fcrm/doctype/crm_deal/crm_deal.py @@ -108,6 +108,8 @@ class CRMDeal(Document): """ sla = get_sla(self) if not sla: + self.first_responded_on = None + self.first_response_time = None return self.sla = sla.name diff --git a/crm/fcrm/doctype/crm_lead/crm_lead.py b/crm/fcrm/doctype/crm_lead/crm_lead.py index 6d26d1d1..b8160525 100644 --- a/crm/fcrm/doctype/crm_lead/crm_lead.py +++ b/crm/fcrm/doctype/crm_lead/crm_lead.py @@ -234,6 +234,8 @@ class CRMLead(Document): """ sla = get_sla(self) if not sla: + self.first_responded_on = None + self.first_response_time = None return self.sla = sla.name diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue index b0f1e6a8..a5c441da 100644 --- a/frontend/src/components/Activities.vue +++ b/frontend/src/components/Activities.vue @@ -1,5 +1,7 @@ + diff --git a/frontend/src/components/Modals/CallLogModal.vue b/frontend/src/components/Modals/CallLogModal.vue index 294103b2..66bd1544 100644 --- a/frontend/src/components/Modals/CallLogModal.vue +++ b/frontend/src/components/Modals/CallLogModal.vue @@ -54,16 +54,21 @@ >
-
-
+ +
+
+
{{ field.value }} @@ -103,7 +108,14 @@ import CalendarIcon from '@/components/Icons/CalendarIcon.vue' import NoteIcon from '@/components/Icons/NoteIcon.vue' import CheckCircleIcon from '@/components/Icons/CheckCircleIcon.vue' import NoteModal from '@/components/Modals/NoteModal.vue' -import { FeatherIcon, Avatar, Tooltip, createDocumentResource, call } from 'frappe-ui' +import FadedScrollableDiv from '@/components/FadedScrollableDiv.vue' +import { + FeatherIcon, + Avatar, + Tooltip, + createDocumentResource, + call, +} from 'frappe-ui' import { ref, computed, h, watch } from 'vue' import { useRouter } from 'vue-router' diff --git a/frontend/src/components/Notifications.vue b/frontend/src/components/Notifications.vue index 1d2f6f09..719046d2 100644 --- a/frontend/src/components/Notifications.vue +++ b/frontend/src/components/Notifications.vue @@ -52,13 +52,10 @@ >
- +
diff --git a/frontend/src/components/Resizer.vue b/frontend/src/components/Resizer.vue index 342ad44c..e81df9e7 100644 --- a/frontend/src/components/Resizer.vue +++ b/frontend/src/components/Resizer.vue @@ -38,6 +38,10 @@ function startResize() { document.addEventListener('mouseup', () => { document.body.classList.remove('select-none') document.body.classList.remove('cursor-col-resize') + document.querySelectorAll('.select-text1').forEach((el) => { + el.classList.remove('select-text1') + el.classList.add('select-text') + }) localStorage.setItem('sidebarWidth', sidebarWidth.value) sidebarResizing.value = false document.removeEventListener('mousemove', resize) @@ -47,6 +51,10 @@ function resize(e) { sidebarResizing.value = true document.body.classList.add('select-none') document.body.classList.add('cursor-col-resize') + document.querySelectorAll('.select-text').forEach((el) => { + el.classList.remove('select-text') + el.classList.add('select-text1') + }) sidebarWidth.value = props.side == 'left' ? e.clientX : window.innerWidth - e.clientX diff --git a/frontend/src/components/SectionFields.vue b/frontend/src/components/SectionFields.vue index fb335158..c762edec 100644 --- a/frontend/src/components/SectionFields.vue +++ b/frontend/src/components/SectionFields.vue @@ -1,5 +1,7 @@