diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-12-09 16:44:05 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-12-09 16:44:05 +0100 |
| commit | 4022493c0b85f966e499b6c03ac7cce5556f15e6 (patch) | |
| tree | 5e3a13dc8a9547f25e61654deb3c1d713a5fced9 /addons/purchase/data/mail_template_data.xml | |
| parent | ef84226e7549067674ce475ac87473aa8ac8d12b (diff) | |
| parent | da2b88bbbe16904cf86a94e4c8e6b12500c1b205 (diff) | |
[MERGE] forward port of branch 9.0 up to da2b88b
Diffstat (limited to 'addons/purchase/data/mail_template_data.xml')
| -rw-r--r-- | addons/purchase/data/mail_template_data.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/purchase/data/mail_template_data.xml b/addons/purchase/data/mail_template_data.xml index 35188397f11..bd261af57b3 100644 --- a/addons/purchase/data/mail_template_data.xml +++ b/addons/purchase/data/mail_template_data.xml @@ -5,7 +5,7 @@ <!--Email template --> <record id="email_template_edi_purchase" model="mail.template"> <field name="name">RFQ - Send by Email</field> - <field name="email_from">${(object.create_uid.email or '')|safe}</field> + <field name="email_from">${(object.create_uid.email and '%s <%s>' % (object.create_uid.name, object.create_uid.email) or '')|safe}</field> <field name="subject">${object.company_id.name|safe} Order (Ref ${object.name or 'n/a' })</field> <field name="partner_to">${object.partner_id.id}</field> <field name="model_id" ref="purchase.model_purchase_order"/> @@ -41,7 +41,7 @@ from ${object.company_id.name}. <!--Email template --> <record id="email_template_edi_purchase_done" model="mail.template"> <field name="name">Purchase Order - Send by Email</field> - <field name="email_from">${object.create_uid.email or ''}</field> + <field name="email_from">${(object.create_uid.email and '%s <%s>' % (object.create_uid.name, object.create_uid.email) or '')|safe}</field> <field name="subject">${object.company_id.name} Order (Ref ${object.name or 'n/a' })</field> <field name="partner_to">${object.partner_id.id}</field> <field name="model_id" ref="purchase.model_purchase_order"/> |