diff options
| author | Ipsita Borisagar <ibo@odoo.com> | 2021-03-23 10:18:24 +0000 |
|---|---|---|
| committer | Ipsita Borisagar <ibo@odoo.com> | 2021-03-23 11:18:34 +0000 |
| commit | 4b2f0ddcbe859ec8453e537aec9d5b0685876eca (patch) | |
| tree | 5912712f657c73011997cc8fde7760c3b467964e | |
| parent | c0aaf2412e586e038cf81646567268607e789f71 (diff) | |
[FIX] crm: avoid to display false in case of void subject
Before this commit:
If there is no subject for message, it effectively displays "False" in case of
void subject.
After this commit:
If there is no subject for message, it will not display "False" in case of void
subject.
Tasks-2156170
closes odoo/odoo#68232
Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
| -rw-r--r-- | addons/crm/i18n/crm.pot | 6 | ||||
| -rw-r--r-- | addons/crm/models/crm_lead.py | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index 742d9cf8272..25deca4c4ea 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -1228,6 +1228,12 @@ msgid "From %(source_name)s : %(source_subject)s" msgstr "" #. module: crm +#: code:addons/crm/models/crm_lead.py:0 +#, python-format +msgid "From %(source_name)s" +msgstr "" + +#. module: crm #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_leads_filter #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_my_activities_filter #: model_terms:ir.ui.view,arch_db:crm.view_crm_case_opportunities_filter diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py index 708604aed52..0856177c29e 100644 --- a/addons/crm/models/crm_lead.py +++ b/addons/crm/models/crm_lead.py @@ -1045,13 +1045,13 @@ class Lead(models.Model): self.ensure_one() for opportunity in opportunities: for message in opportunity.message_ids: + if message.subject: + subject = _("From %(source_name)s : %(source_subject)s", source_name=opportunity.name, source_subject=message.subject) + else: + subject = _("From %(source_name)s", source_name=opportunity.name) message.write({ 'res_id': self.id, - 'subject': _( - "From %(source_name)s : %(source_subject)s", - source_name=opportunity.name, - source_subject=message.subject - ) + 'subject': subject, }) return True |