From cc33585eeccffb2c33a4640aee7804fe550cf5a9 Mon Sep 17 00:00:00 2001
From: dsolanki <dhara.solanki@initos.com>
Date: Wed, 1 Feb 2023 12:07:54 +0530
Subject: [PATCH] [15.0][FIX] mail_activity_team: warning Two fields have same
 label

---
 mail_activity_team/i18n/mail_activity_team.pot | 16 ++++++++++------
 mail_activity_team/models/mail_activity.py     |  6 ++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/mail_activity_team/i18n/mail_activity_team.pot b/mail_activity_team/i18n/mail_activity_team.pot
index 3544c04e0..e86635cc0 100644
--- a/mail_activity_team/i18n/mail_activity_team.pot
+++ b/mail_activity_team/i18n/mail_activity_team.pot
@@ -57,12 +57,6 @@ msgstr ""
 msgid "Assign to missing activities"
 msgstr ""
 
-#. module: mail_activity_team
-#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__team_user_id
-#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__user_id
-msgid "Assigned to"
-msgstr ""
-
 #. module: mail_activity_team
 #: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__create_uid
 msgid "Created by"
@@ -163,6 +157,11 @@ msgstr ""
 msgid "Team Members"
 msgstr ""
 
+#. module: mail_activity_team
+#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__team_user_id
+msgid "Team user"
+msgstr ""
+
 #. module: mail_activity_team
 #: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_view_kanban
 msgid "Team:"
@@ -180,6 +179,11 @@ msgstr ""
 msgid "Used models"
 msgstr ""
 
+#. module: mail_activity_team
+#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity__user_id
+msgid "User"
+msgstr ""
+
 #. module: mail_activity_team
 #: model:ir.model,name:mail_activity_team.model_res_users
 msgid "Users"
diff --git a/mail_activity_team/models/mail_activity.py b/mail_activity_team/models/mail_activity.py
index 7eb0a209b..b59d67c10 100644
--- a/mail_activity_team/models/mail_activity.py
+++ b/mail_activity_team/models/mail_activity.py
@@ -20,8 +20,10 @@ class MailActivity(models.Model):
             )
         return self.env["mail.activity.team"].search(domain, limit=1)
 
-    user_id = fields.Many2one(required=False)
-    team_user_id = fields.Many2one(related="user_id", readonly=False)
+    user_id = fields.Many2one(string="User", required=False)
+    team_user_id = fields.Many2one(
+        string="Team user", related="user_id", readonly=False
+    )
 
     team_id = fields.Many2one(
         comodel_name="mail.activity.team", default=lambda s: s._get_default_team_id()