[IMP] mail,mass_mailing: changed duplicate field label in the same model

This commit is contained in:
Kinjal Mehta
2018-01-04 17:56:54 +05:30
parent 0da738dc8c
commit d2b55d75a8
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -70,7 +70,7 @@ class MailActivity(models.Model):
# owner
res_id = fields.Integer('Related Document ID', index=True, required=True)
res_model_id = fields.Many2one(
'ir.model', 'Related Document Model',
'ir.model', 'Document Model',
index=True, ondelete='cascade', required=True)
res_model = fields.Char(
'Related Document Model',
@@ -299,13 +299,13 @@ class MailActivityMixin(models.AbstractModel):
activity_state = fields.Selection([
('overdue', 'Overdue'),
('today', 'Today'),
('planned', 'Planned')], string='State',
('planned', 'Planned')], string='Activity State',
compute='_compute_activity_state',
groups="base.group_user",
help='Status based on activities\nOverdue: Due date is already passed\n'
'Today: Activity date is today\nPlanned: Future activities.')
activity_user_id = fields.Many2one(
'res.users', 'Responsible',
'res.users', 'Responsible Person',
related='activity_ids.user_id',
search='_search_activity_user_id',
groups="base.group_user")
@@ -10,7 +10,7 @@ class MailComposeMessage(models.TransientModel):
mass_mailing_campaign_id = fields.Many2one('mail.mass_mailing.campaign', string='Mass Mailing Campaign')
mass_mailing_id = fields.Many2one('mail.mass_mailing', string='Mass Mailing', ondelete='cascade')
mass_mailing_name = fields.Char(string='Mass Mailing')
mass_mailing_name = fields.Char(string='Mass Mailing Name')
mailing_list_ids = fields.Many2many('mail.mass_mailing.list', string='Mailing List')
@api.multi