diff --git a/data/mail_data.xml b/data/mail_data.xml index 1cda9ecf77bd162bf5612afb5a42b337eb6758b7..bd760ced72f21d2c2fe4b96b82d4101a7bba2579 100644 --- a/data/mail_data.xml +++ b/data/mail_data.xml @@ -98,7 +98,7 @@ >${'portal_url' in ctx and ctx['portal_url'] or ''}</a></p> <br /> Bonne journée,<br /> - Service adhérent, + Service adhérent ${'list_op' in ctx and ctx['list_op'] or ''}, </div> </td></tr> <tr><td style="text-align:center;"> diff --git a/models/res_partner.py b/models/res_partner.py index 203a6ad5c18bff470767ce49e468bd3f2450abe2..8ae42450cc4a6e578e4f1b9d63ccc60aa3e0715f 100644 --- a/models/res_partner.py +++ b/models/res_partner.py @@ -134,9 +134,9 @@ class ResPartner(models.Model): op_str = "" for op in acc_op_ids: if op_str: - op_str += ", " + op.name + op_str += ", " + op.description else: - op_str = op.name + op_str = op.description if template: template.with_context(