Techsystech
/
social
mirror of https://github.com/OCA/social.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[15.0][FIX] mail_activity_team: warning Two fields have same label

pull/1321/head
dsolanki 2023-02-01 12:07:54 +05:30 committed by sonhd91
parent 0453cb46fa
commit cc33585eec
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mail_activity_team/i18n/mail_activity_team.pot
View File

@ -57,12 +57,6 @@ msgstr ""
msgid "Assign to missing activities" msgid "Assign to missing activities"
msgstr "" 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 #. module: mail_activity_team
#: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__create_uid #: model:ir.model.fields,field_description:mail_activity_team.field_mail_activity_team__create_uid
msgid "Created by" msgid "Created by"
@ -163,6 +157,11 @@ msgstr ""
msgid "Team Members" msgid "Team Members"
msgstr "" 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 #. module: mail_activity_team
#: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_view_kanban #: model_terms:ir.ui.view,arch_db:mail_activity_team.mail_activity_view_kanban
msgid "Team:" msgid "Team:"
@ -180,6 +179,11 @@ msgstr ""
msgid "Used models" msgid "Used models"
msgstr "" 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 #. module: mail_activity_team
#: model:ir.model,name:mail_activity_team.model_res_users #: model:ir.model,name:mail_activity_team.model_res_users
msgid "Users" msgid "Users"

6
mail_activity_team/models/mail_activity.py
View File

@ -20,8 +20,10 @@ class MailActivity(models.Model):
) )
return self.env["mail.activity.team"].search(domain, limit=1) return self.env["mail.activity.team"].search(domain, limit=1)
user_id = fields.Many2one(required=False) user_id = fields.Many2one(string="User", required=False)
team_user_id = fields.Many2one(related="user_id", readonly=False) team_user_id = fields.Many2one(
string="Team user", related="user_id", readonly=False
)
team_id = fields.Many2one( team_id = fields.Many2one(
comodel_name="mail.activity.team", default=lambda s: s._get_default_team_id() comodel_name="mail.activity.team", default=lambda s: s._get_default_team_id()