diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-10-23 18:31:55 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-10-23 18:31:55 +0200 |
| commit | 56ef99d0507e58b5c01080be45f263795d78122f (patch) | |
| tree | e341f42a2d3dcc04b96ce40b639a07d54888c840 /addons/website_quote/data/website_quotation_data.xml | |
| parent | dc729c86117f6bb7b1f176bbd8eb7b5cfe45dbed (diff) | |
| parent | 105b1c0014f6f4c1314af8fa612bdeb38356b4ec (diff) | |
[MERGE] forward port of branch saas-6 up to 105b1c0014f6f4c1314af8fa612bdeb38356b4ec
Diffstat (limited to 'addons/website_quote/data/website_quotation_data.xml')
| -rw-r--r-- | addons/website_quote/data/website_quotation_data.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/website_quote/data/website_quotation_data.xml b/addons/website_quote/data/website_quotation_data.xml index 47e13bf286b..bb01e321a32 100644 --- a/addons/website_quote/data/website_quotation_data.xml +++ b/addons/website_quote/data/website_quotation_data.xml @@ -14,7 +14,11 @@ <!-- Update Email template to send right quote url --> + </data> + <!-- Mails & quote templates is done in a NOUPDATE block + so users can freely customize/delete them --> + <data noupdate="1"> <record id="sale.email_template_edi_sale" model="mail.template"> <field name="body_html"><![CDATA[ <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; "> @@ -150,11 +154,7 @@ </section> </field> </record> - </data> - <!-- Mail template is done in a NOUPDATE block - so users can freely customize/delete them --> - <data noupdate="1"> <!--Email template --> <record id="email_template_edi_sale" model="mail.template"> <field name="name">Sales Order - Send by Email (Online Quote)</field> |