From 0096a434655bedb12d6b6ba60991d5adfa983ac9 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <sharique.rik@gmail.com>
Date: Fri, 4 Aug 2023 15:10:32 +0530
Subject: [PATCH] fix: show field label instead of fieldname

---
 crm/crm/doctype/crm_lead/api.py        | 6 ++++++
 frontend/src/components/Activities.vue | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/crm/crm/doctype/crm_lead/api.py b/crm/crm/doctype/crm_lead/api.py
index 995b48ae..9e77709f 100644
--- a/crm/crm/doctype/crm_lead/api.py
+++ b/crm/crm/doctype/crm_lead/api.py
@@ -28,6 +28,8 @@ def get_lead(name):
 	return { **lead, 'activities': activities }
 
 def get_activities(doc, docinfo):
+	lead_fields_meta = frappe.get_meta("CRM Lead").fields
+
 	activities = [{
 		"activity_type": "creation",
 		"creation": doc.creation,
@@ -39,8 +41,10 @@ def get_activities(doc, docinfo):
 		data = json.loads(version.data)
 		if change := data.get("changed")[0]:
 			activity_type = "changed"
+			field_label = next((f.label for f in lead_fields_meta if f.fieldname == change[0]), None)
 			data = {
 				"field": change[0],
+				"field_label": field_label,
 				"old_value": change[1],
 				"value": change[2],
 			}
@@ -50,12 +54,14 @@ def get_activities(doc, docinfo):
 				activity_type = "added"
 				data = {
 					"field": change[0],
+					"field_label": field_label,
 					"value": change[2],
 				}
 			elif change[1] and not change[2]:
 				activity_type = "removed"
 				data = {
 					"field": change[0],
+					"field_label": field_label,
 					"value": change[1],
 				}
 
diff --git a/frontend/src/components/Activities.vue b/frontend/src/components/Activities.vue
index 66b09873..91882b53 100644
--- a/frontend/src/components/Activities.vue
+++ b/frontend/src/components/Activities.vue
@@ -31,10 +31,10 @@
               <span class="text-gray-900">{{ activity.owner_name }}</span>
               <span v-if="activity.type">{{ activity.type }}</span>
               <span
-                v-if="activity.data.field"
+                v-if="activity.data.field_label"
                 class="text-gray-900 truncate max-w-xs"
               >
-                {{ activity.data.field }}
+                {{ activity.data.field_label }}
               </span>
               <span v-if="activity.value">{{ activity.value }}</span>
               <span