diff options
| author | Kinjal Mehta <kme@odoo.com> | 2017-12-06 14:42:28 +0530 |
|---|---|---|
| committer | Kinjal Mehta <kme@odoo.com> | 2018-01-04 17:56:54 +0530 |
| commit | d2b55d75a8a2d23bbdb3bcdb4a2842868b6db1a2 (patch) | |
| tree | 87ddb4bb2314a5b3212ad2550ec1b1eb9755da76 /addons | |
| parent | 0da738dc8cf1040b8c7d956cb6042f2c042b8be7 (diff) | |
[IMP] mail,mass_mailing: changed duplicate field label in the same model
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mail/models/mail_activity.py | 6 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mail_compose_message.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py index 2f53fe3fe72..68922cb332f 100644 --- a/addons/mail/models/mail_activity.py +++ b/addons/mail/models/mail_activity.py @@ -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") diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py index 8708dd9a098..8f28f6b5244 100644 --- a/addons/mass_mailing/wizard/mail_compose_message.py +++ b/addons/mass_mailing/wizard/mail_compose_message.py @@ -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 |