diff options
| author | Fabien Pinckaers <fp@openerp.com> | 2016-07-17 01:02:06 +0200 |
|---|---|---|
| committer | Fabien Pinckaers <fp@openerp.com> | 2016-07-17 01:02:06 +0200 |
| commit | 9fbe082b2b59ba35a52e01bebd01bc533e3acaef (patch) | |
| tree | 8a702d4775a42097ed2ff35cbbe8b7d25c83cb3a /addons | |
| parent | 5b4d247674a00ede5ef956ec6cc6d9028e47c3fd (diff) | |
[IMP] web_editor: css regular spacing between <p> to avoid bad layout
for email previews (e.g. sale order)
[IMP] improved email template for SO, with added signature
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/sale/data/mail_template_data.xml | 4 | ||||
| -rw-r--r-- | addons/web_editor/static/src/less/web_editor.backend.less | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml index d9456f28a0a..f7dde926e0a 100644 --- a/addons/sale/data/mail_template_data.xml +++ b/addons/sale/data/mail_template_data.xml @@ -19,7 +19,6 @@ % set is_online = access_action and access_action['type'] == 'ir.actions.act_url' % set access_name = is_online and object.template_id and 'Accept and pay %s online' % doc_name or 'View %s' % doc_name % set access_url = is_online and access_action['url'] or object.get_signup_url() - <p>Dear % if object.partner_id.is_company and object.child_ids: ${object.partner_id.child_ids[0].name} @@ -41,6 +40,9 @@ from ${object.company_id.name}. </p> <p>If you have any question, do not hesitate to contact us.</p> <p>Best regards,</p> +% if object.user_id and object.user_id.signature: + ${object.user_id.signature | safe} +% endif ]]></field> </record> diff --git a/addons/web_editor/static/src/less/web_editor.backend.less b/addons/web_editor/static/src/less/web_editor.backend.less index 53789aae8af..4a9c13228b0 100644 --- a/addons/web_editor/static/src/less/web_editor.backend.less +++ b/addons/web_editor/static/src/less/web_editor.backend.less @@ -6,9 +6,7 @@ line-height: initial !important; color: initial !important; p { - margin: initial; font-family: 'Lucida Grande', Helvetica, Verdana, Arial, sans-serif; - -webkit-margin-before: 0; font-size: 13px; } a, a:hover { |