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() -

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}.

If you have any question, do not hesitate to contact us.

Best regards,

+% if object.user_id and object.user_id.signature: + ${object.user_id.signature | safe} +% endif ]]> 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 {