[IMP] various: template update

Templates have been updated to remove most of the styling and
simplify them. Some workding has also be done.

12 files changed, 242 insertions, 263 deletions

diff --git a/addons/auth_signup/auth_signup_data.xml b/addons/auth_signup/auth_signup_data.xml
index 51a4dbfc676..98d1902cfc1 100644
--- a/addons/auth_signup/auth_signup_data.xml
+++ b/addons/auth_signup/auth_signup_data.xml
@@ -20,51 +20,77 @@
 
         <!-- Email template for reset password -->
         <record id="reset_password_email" model="mail.template">
-            <field name="name">Reset Password</field>
+            <field name="name">Auth Signup: Reset Password</field>
             <field name="model_id" ref="base.model_res_users"/>
             <field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
             <field name="email_to">${object.email|safe}</field>
             <field name="subject">Password reset</field>
             <field name="body_html"><![CDATA[
-<p>A password reset was requested for the Odoo account linked to this email.</p>
-
-<p>You may change your password by following <a href="${object.signup_url}">this link</a>, which will remain valid during 24 hours.</p>
-
-<p>Note: If you do not expect this, you can safely ignore this email.</p>]]></field>
+<div style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
+    <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
+        <tbody><tr>
+            <td valign="center" width="200" style="padding:10px 10px 10px 5px;font-size: 12px">
+                <img src="/logo.png" style="padding: 0px; margin: 0px; height: auto; width: 80px;" alt="${user.company_id.name}">
+            </td>
+        </tr></tbody>
+    </table>
+</div>
+<div style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
+    <p>Dear ${object.name},</p>
+    <p>A password reset was requested for the Odoo account linked to this email.</p>
+    <p>You may change your password by following this link which will remain valid during 24 hours:</p>
+    <div style="text-align: center; margin-top: 16px;">
+        <a href="${object.signup_url}" style="padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px">Change password</a>
+    </div>
+    <p>If you do not expect this, you can safely ignore this email.</p>
+    <p>Best regards,</p>
+</div>
+<div style="padding:0px;width:600px;margin:auto; margin-top: 10px; background: #fff repeat top /100%;color:#777777">
+    ${user.signature | safe}
+    <p style="font-size: 11px; margin-top: 10px;">
+        <strong>Sent by ${user.company_id.name} using <a href="www.odoo.com" style="text-decoration:none; color: #a24689;">Odoo</a></strong>
+    </p>
+</div>]]></field>
+            <field name="user_signature" eval="False"/>
         </record>
 
         <!-- Email template for new users -->
         <record id="set_password_email" model="mail.template">
-            <field name="name">Odoo Enterprise Connection</field>
+            <field name="name">Auth Signup: Odoo Connection</field>
             <field name="model_id" ref="base.model_res_users"/>
             <field name="email_from"><![CDATA[${object.company_id.name} <${(object.company_id.email or user.email)|safe}>]]></field>
             <field name="email_to">${object.email|safe}</field>
             <field name="subject"><![CDATA[${object.company_id.name} invitation to connect on Odoo]]></field>
-            <field name="body_html">
-                <![CDATA[
-                    <p>
-                        ${object.name},
-                    </p>
-                    <p>
-                        You have been invited to connect to "${object.company_id.name}" in order to get access to your documents in Odoo.
-                    </p>
-                    <p>
-                        To accept the invitation, click on the following link:
-                    </p>
-                    <ul>
-                        <li><a href="${object.signup_url}">Accept invitation to "${object.company_id.name}"</a></li>
-                    </ul>
-                    <p>
-                        Thanks,
-                    </p>
-                    <pre>
---
-${object.company_id.name or ''}
-${object.company_id.email or ''}
-${object.company_id.phone or ''}
-                    </pre>
-                ]]>
-            </field>
+            <field name="body_html"><![CDATA[
+<div style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
+    <table cellspacing="0" cellpadding="0" style="width:600px;border-collapse:collapse;background:inherit;color:inherit">
+        <tbody><tr>
+            <td valign="center" width="200" style="padding:10px 10px 10px 5px;font-size: 12px">
+                <img src="/logo.png" style="padding: 0px; margin: 0px; height: auto; width: 80px;" alt="${user.company_id.name}">
+            </td>
+        </tr></tbody>
+    </table>
+</div>
+<div style="padding:0px;width:600px;margin:auto;background: #FFFFFF repeat top /100%;color:#777777">
+<p>Dear ${object.name},</p>
+    <p>
+        You have been invited to connect to "${object.company_id.name}" in order to get access to your documents in Odoo.
+    </p>
+    <p>
+        To accept the invitation, click on the following link:
+    </p>
+    <div style="text-align: center; margin-top: 16px;">
+         <a href="${object.signup_url}" style="padding: 5px 10px; font-size: 12px; line-height: 18px; color: #FFFFFF; border-color:#a24689; text-decoration: none; display: inline-block; margin-bottom: 0px; font-weight: 400; text-align: center; vertical-align: middle; cursor: pointer; white-space: nowrap; background-image: none; background-color: #a24689; border: 1px solid #a24689; border-radius:3px">Accept invitation to "${object.company_id.name}"</a>
+    </div>
+    <p>Best regards,</p>
+</div>
+<div style="padding:0px;width:600px;margin:auto; margin-top: 10px; background: #fff repeat top /100%;color:#777777">
+    ${user.signature | safe}
+    <p style="font-size: 11px; margin-top: 10px;">
+        <strong>Sent by ${user.company_id.name} using <a href="www.odoo.com" style="text-decoration:none; color: #a24689;">Odoo</a></strong>
+    </p>
+</div>]]></field>
+            <field name="user_signature" eval="False"/>
         </record>
 
     </data>
diff --git a/addons/crm/crm_lead_data.xml b/addons/crm/crm_lead_data.xml
index 284dad5e6a9..03f5086b7b5 100644
--- a/addons/crm/crm_lead_data.xml
+++ b/addons/crm/crm_lead_data.xml
@@ -72,18 +72,20 @@
             <field name="body_html"></field>
         </record>
         <record id="email_template_opportunity_reminder_mail" model="mail.template">
-            <field name="name">Reminder to User</field>
+            <field name="name">Lead: Reminder</field>
             <field name="model_id" ref="crm.model_crm_lead"/>
             <field name="auto_delete" eval="True"/>
             <field name="email_from">admin@example.com</field>
             <field name="email_to">${(object.user_id != False and object.user_id.email)|safe}</field>
-            <field name="subject">Reminder on Lead: ${object.id} from ${object.partner_id != False and object.partner_id.name or object.contact_name}</field>
-            <field name="body_html"><![CDATA[<p>This opportunity did not have any activity since at least 5 days. Here are some details:</p>
-<ul>
-<li>Name: ${object.name}</li>
-<li>ID: ${object.id}</li>
-<li>Description: ${object.description}</li>
-</ul>]]></field>
+            <field name="subject">Reminder: Lead ${object.name} from ${object.partner_id != False and object.partner_id.name or object.contact_name}</field>
+            <field name="body_html"><![CDATA[
+<p>Hello ${object.user_id and object.user_id.name or ''},</p>
+<p>The opportunity <strong>${object.name}</strong> did not have any activity since at least 5 days.</p>
+%if object.description:
+<p>Here is the description about the opportunity : </p><p><i>${object.description}</i>
+%endif
+</p><p>Thank you!</p>
+]]></field>
         </record>
 
     </data>
diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml
index 5a3798a39a6..77bd8003ca4 100644
--- a/addons/event/data/email_template_data.xml
+++ b/addons/event/data/email_template_data.xml
@@ -6,66 +6,54 @@
             <field name="name">Event: Registration Badge</field>
             <field name="model_id" ref="event.model_event_registration"/>
             <field name="email_from">${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe}</field>
-            <field name="email_to" >${object.email|safe}</field>
+            <field name="email_to" >${object.partner_id.email or object.email|safe}</field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="subject">Your badge for ${object.event_id.name}</field>
             <field name="auto_delete" eval="True"/>
             <field name="report_template" ref="report_event_registration_badge"/>
             <field name="report_name">badge_of_${(object.event_id.name or '').replace('/','_')}</field>
-            <field name="body_html"><![CDATA[<p>Hello ${object.name},</p>
-<p>We confirm that your subscription to the event ${object.event_id.name} has been recorded.
-Please, Find your <b>Event Badge</b> attached with this mail.</p>
-<p>Thank you for your participation!</p>
-<p>Best regards</p>]]></field>
+            <field name="body_html"><![CDATA[
+<p>Dear ${object.name},</p>
+<p>Thank you for your inquiry.</p>
+<p>Here is your badge for the event ${object.event_id.name}.</p>
+<p>If you have any questions, please let us know.</p>
+<p>Best regards,</p>]]></field>
         </record>
 
         <record id="event_subscription" model="mail.template">
-            <field name="name">Event subscription</field>
+            <field name="name">Event: Subscription</field>
             <field name="model_id" ref="event.model_event_registration"/>
             <field name="email_from">${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe}</field>
-            <field name="email_to" >${object.email|safe}</field>
+            <field name="email_to" >${object.partner_id.email or object.email|safe}</field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="reply_to">${object.event_id.reply_to|safe}</field>
             <field name="subject">Your subscription at ${object.event_id.name}</field>
-            <field name="body_html"><![CDATA[<p>Hello ${object.name},</p>
-<p>We confirm that your subscription to the event ${object.event_id.name} has been recorded.
-You will automatically receive an email providing you more practical information (such as the schedule, the agenda...) as soon as the event is confirmed.</p>
-<p>Thank you for your participation!</p>
-<p>Best regards</p>]]></field>
+            <field name="body_html"><![CDATA[
+<p>Dear ${object.name},</p>
+<p>Thank you for your inquiry.</p>
+<p>We confirm your subscription to the event <b>${object.event_id.name}</b>. You will receive emails with practical information.</p>
+<p>If you have any questions, please let us know.</p>
+<p>Best regards,</p>]]></field>
         </record>
 
         <record id="event_reminder" model="mail.template">
-            <field name="name">Event: reminder</field>
+            <field name="name">Event: Reminder</field>
             <field name="model_id" ref="event.model_event_registration"/>
             <field name="email_from">${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe}</field>
             <field name="email_to" >${object.partner_id.email or object.email|safe}</field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="reply_to">${object.event_id.reply_to|safe}</field>
             <field name="subject">Reminder of event ${object.event_id.name}</field>
-            <field name="body_html"><![CDATA[<p>Hello ${object.name},</p>
-<p>This is a reminder for ${object.event_id.name} that you registered for is confirmed and will be held from ${object.event_id.date_begin_located} to ${object.event_id.date_end_located}.
-For any further information please contact our event department.</p>
-<p>Thank you for your participation!</p>
-<p>Best regards</p>]]></field>
-        </record>
-
-        <record id="event_thanks" model="mail.template">
-            <field name="name">Event: thanks for attending</field>
-            <field name="model_id" ref="event.model_event_registration"/>
-            <field name="email_from">${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe}</field>
-            <field name="email_to" >${object.partner_id.email or object.email|safe}</field>
-            <field name="lang">${object.partner_id.lang}</field>
-            <field name="reply_to">${object.event_id.reply_to|safe}</field>
-            <field name="subject">Thanks for attending ${object.event_id.name}</field>
-            <field name="body_html"><![CDATA[<p>Hello ${object.name},</p>
-<p>We would like to thank you for your presence at our event ${object.event_id.name}.
-<br/><br/>
-    % if object.event_id.organizer_id and object.event_id.organizer_id.is_company:
-        <strong>The ${object.event_id.organizer_id.name} Team</strong>
-    % elif object.event_id.organizer_id:
-        <strong>${object.event_id.organizer_id.name}</strong>
-    % endif
-</p>]]></field>
+            <field name="body_html"><![CDATA[
+<p>Dear ${object.name},</p>
+<p>Thank you for your registration to the event ${object.event_id.name}.</p>
+<p>The event will take place at ${object.event_id.address_id.city}
+% if object.event_id.address_id.street
+, ${object.event_id.address_id.street}
+% endif
+from ${object.event_id.date_begin_located} to ${object.event_id.date_end_located}.</p>
+<p>If you have any questions, please let us know.</p>
+<p>Best regards,</p>]]></field>
         </record>
 
     </data>
diff --git a/addons/gamification/data/badge.xml b/addons/gamification/data/badge.xml
index 562f720fe4d..ed0c03e13ee 100644
--- a/addons/gamification/data/badge.xml
+++ b/addons/gamification/data/badge.xml
@@ -41,7 +41,6 @@
             <field name="description">Badge Granted</field>
         </record>
 
-
         <record id="email_template_badge_received" model="mail.template">
             <field name="name">Received Badge</field>
             <field name="model_id" ref="gamification.model_gamification_badge_user"/>
diff --git a/addons/gamification/data/goal_base.xml b/addons/gamification/data/goal_base.xml
index 155bddb05bd..ef6bf5a7629 100644
--- a/addons/gamification/data/goal_base.xml
+++ b/addons/gamification/data/goal_base.xml
@@ -10,9 +10,9 @@
             <field name="model_id" ref="gamification.model_gamification_goal"/>
             <field name="lang">${object.user_id.lang}</field>
             <field name="body_html"><![CDATA[
-    <header>
+    <p>
         <strong>Reminder ${object.name}</strong>
-    </header>
+    </p>
     
     <p>You have not updated your progress for the goal ${object.definition_id.name} (currently reached at ${object.completeness}%) for at least ${object.remind_update_delay} days. Do not forget to do it.</p>
             ]]></field>
@@ -21,9 +21,9 @@
         <record id="simple_report_template" model="mail.template">
             <field name="name">Simple Challenge Report Progress</field>
             <field name="body_html"><![CDATA[
-<header>
+<p>
     <strong>${object.name}</strong>
-</header>
+</p>
 <p class="oe_grey">The following message contains the current progress for the challenge ${object.name}</p>
 
 % if object.visibility_mode == 'personal':
diff --git a/addons/hr_recruitment/data/hr_recruitment_data.xml b/addons/hr_recruitment/data/hr_recruitment_data.xml
index d3d27a49a2b..8e0d9579008 100644
--- a/addons/hr_recruitment/data/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/data/hr_recruitment_data.xml
@@ -18,57 +18,52 @@
     </record>
 
     <!-- Templates for interest / refusing applicants -->
-    <record id="applicant_refuse" model="mail.template">
-        <field name="name">Application refused</field>
+    <record id="email_template_data_applicant_refuse" model="mail.template">
+        <field name="name">Applicant: Refuse</field>
         <field name="subject">Application refused</field>
         <field name="email_to">${object.email_from}</field>
         <field name="partner_to">${object.partner_id and object.partner_id.id or ''}</field>
         <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
-        <field name="user_signature" eval="0"/>
-        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name or 'applicant'},</p>
-        <p>We thank you for your interest in our company and for your application.
-        Unfortunately, your profile does not match with our needs or our recruitment
-        campaign has reached its term.</p>
-        <p>If you want more details, feel free to contact us by phone.</p>
-        <p>Kind regards,</p>
-        <br/>
-         ${object.user_id and object.user_id.signature | safe or ''}]]></field>
-    </record>
-
-    <record id="hr_welcome_new_employee" model="mail.template">
-        <field name="name">Welcome New Employee</field>
-        <field name="model_id" ref="hr.model_hr_employee"/>
-        <field name="subject">Welcoming ${object.name} </field>
+        <field name="user_signature" eval="False"/>
         <field name="body_html"><![CDATA[
-            <p>
-                %if object.department_id:
-                    I’m very pleased to announce that <strong> ${object.name} </strong> will be joining us as a ${object.job_id.name}
-                    in ${object.department_id.name}.
-                %else:
-                    I’m very pleased to announce that <strong> ${object.name} </strong> will be joining us as a ${object.job_id.name}.
-                %endif
-            </p>
-            <p>Please welcome him/her and help him/her finding his/her marks.</p>
-            ]]></field>
+<p>Dear ${object.partner_name or 'applicant'},</p>
+<p>Thank you for your enquiry.<br />
+Unfortunately, your profile does not match with our needs</p>
+<p>If you have any questions, please let us know.</p>
+<p>Best regards,</p>]]></field>
     </record>
 
-    <record id="applicant_interest" model="mail.template">
-        <field name="name">Application approved</field>
+    <record id="email_template_data_applicant_interest" model="mail.template">
+        <field name="name">Applicant: Interest</field>
         <field name="subject">Application approved</field>
         <field name="email_to">${object.email_from}</field>
         <field name="partner_to">${object.partner_id and object.partner_id.id or ''}</field>
         <field name="lang">${object.partner_id and object.partner_id.lang or ''}</field>
         <field name="model_id" ref="hr_recruitment.model_hr_applicant"/>
-        <field name="user_signature" eval="0"/>
-        <field name="body_html"><![CDATA[<p>Dear ${object.partner_name or 'applicant'},</p>
-        <p>Congrats! Your resume's got our interest!
-        I will call you as soon as possible to make a 10 minutes phone interview and  plan a first meeting.</p>
-        <p>If we can’t reach you or if you miss our call, feel free to reach me back on the number 001 312 349 3030
-        If I do not answer, please let me a message with some schedules to call you back.</p>
-        <p>Kind regards,</p>
-        <br/>
-         ${object.user_id.signature | safe}]]></field>
+        <field name="user_signature" eval="False"/>
+        <field name="body_html"><![CDATA[
+<p>Dear ${object.partner_name or 'applicant'},</p>
+<p>Thank you for your enquiry.<br />
+Your resume got our interest. I will contact you as soon as possible to plan
+next steps of the recruitment process.</p>
+<p>If you have any questions, please let us know.</p>
+<p>Best regards,</p>]]></field>
+    </record>
+
+    <record id="email_template_data_applicant_employee" model="mail.template">
+        <field name="name">Applicant: Welcome new employee</field>
+        <field name="subject">Welcome ${object.name} </field>
+        <field name="model_id" ref="hr.model_hr_employee"/>
+        <field name="body_html"><![CDATA[
+<p>Dear all,</p>
+<p>I’m very pleased to announce that <strong> ${object.name} </strong> will be
+joining us as a ${object.job_id.name}
+%if object.department_id:
+    in ${object.department_id.name}.
+%endif
+.</p>
+<p>Please welcome him/her and help him/her finding his/her marks.</p>]]></field>
     </record>
 
         <!--    Resource(type_id)        -->
diff --git a/addons/hr_recruitment/data/hr_recruitment_demo.xml b/addons/hr_recruitment/data/hr_recruitment_demo.xml
index f5e3fad6ec8..20e84692c23 100644
--- a/addons/hr_recruitment/data/hr_recruitment_demo.xml
+++ b/addons/hr_recruitment/data/hr_recruitment_demo.xml
@@ -8,7 +8,7 @@
     </record>
     <record model="hr.recruitment.stage" id="stage_job2">
         <field name="name">First Interview</field>
-        <field name="template_id" ref="applicant_interest"/>
+        <field name="template_id" ref="email_template_data_applicant_interest"/>
         <field name="sequence">2</field>
     </record>
     <record model="hr.recruitment.stage" id="stage_job3">
diff --git a/addons/hr_recruitment/models/hr_employee.py b/addons/hr_recruitment/models/hr_employee.py
index fc4e7a5e97b..98d367ab483 100644
--- a/addons/hr_recruitment/models/hr_employee.py
+++ b/addons/hr_recruitment/models/hr_employee.py
@@ -28,7 +28,7 @@ class hr_employee(models.Model):
         self.ensure_one()
         IrModelData = self.env['ir.model.data']
         channel_all_employees = IrModelData.xmlid_to_object('mail.channel_all_employees')
-        template_new_employee = IrModelData.xmlid_to_object('hr_recruitment.hr_welcome_new_employee')
+        template_new_employee = IrModelData.xmlid_to_object('hr_recruitment.email_template_data_applicant_employee')
         if template_new_employee:
             MailTemplate = self.env['mail.template']
             body_html = MailTemplate.render_template(template_new_employee.body_html, 'hr.employee', self.id)
diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml
index 3a6680a6711..06fb4545360 100644
--- a/addons/marketing_campaign/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign/marketing_campaign_demo.xml
@@ -7,7 +7,11 @@
             <field name="subject">Welcome to the Odoo Partner Channel!</field>
             <field name="email_to">${(object.email or '')|safe}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_html">Hello, you will receive your welcome pack via email shortly.</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>You will receive your welcome pack via email shortly.</p>
+<p>Thank you,</p>
+]]></field>
         </record>
         <record id="email_template_2" model="mail.template">
             <field name="name">congrats silver partner</field>
@@ -15,7 +19,11 @@
             <field name="subject">Congratulations! You are now a Silver Partner!</field>
             <field name="email_to">${(object.email or '')|safe}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_html">Hi, we are delighted to welcome you among our Silver Partners as of today!</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>We are delighted to welcome you among our Silver Partners as of today!</p>
+<p>Thank you,</p>
+]]></field>
         </record>
 
         <record id="email_template_3" model="mail.template">
@@ -24,7 +32,11 @@
             <field name="subject">Congratulations! You are now one of our Gold Partners!</field>
             <field name="email_to">${(object.email or '')|safe}</field>
             <field name="model_id" ref="base.model_res_partner"/>
-            <field name="body_html">Hi, we are delighted to let you know that you have entered the select circle of our Gold Partners</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>We are delighted to let you know that you have entered the select circle of our Gold Partners!</p>
+<p>Thank you,</p>
+]]></field>
         </record>
 
 
diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
index baa4ac59079..18ef2176ba1 100644
--- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
+++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
@@ -13,146 +13,117 @@
 
         <!-- Email tempalte -->
         <record id="email_template_1" model="mail.template">
+            <field name="name">Lead Automation: For Odoo OnDemand Free Trial 2015</field>
             <field name="subject">Thanks for showing interest in Odoo</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;Thanks for the genuine interest you have shown in Odoo.&lt;/p&gt;
-            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
-            <field name="name">For Odoo OnDemand Free Trial 2015</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>Thanks for the genuine interest you have shown in Odoo.</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
         </record>
         <record id="email_template_2" model="mail.template">
+            <field name="name">Lead Automation: For Odoo Discovery Day on May 2015</field>
             <field name="subject">Propose to subscribe to the Odoo Discovery Day on May 2015</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;We have very good offer that might suit you.
-            We suggest you subscribe to the Odoo Discovery Day on May 2015.&lt;/p&gt;
-            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
-            <field name="name">For Odoo Discovery Day on May 2015</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>We have very good offer that might suit you. We suggest you subscribe to the
+Odoo Discovery Day on May 2015.</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
         </record>
 
         <record id="email_template_3" model="mail.template">
-            <field name="subject">Thanks for subscribing to the Odoo Discovery Day</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
+            <field name="subject">Lead Automation: Thanks for subscribing to the Odoo Discovery Day</field>
             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;Thanks for showing interest and for subscribing to the Odoo Discovery Day.&lt;/p&gt;
-            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>Thanks for showing interest and for subscribing to the Odoo Discovery Day.</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
             <field name="name">For Odoo Discovery Day</field>
         </record>
 
         <record id="email_template_4" model="mail.template">
+            <field name="name">Lead Automation: For Odoo book</field>
             <field name="subject">Thanks for buying the Odoo book</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-           <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
-             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;Thanks for showing interest and buying the Odoo book.&lt;/p&gt;
-            If any further information required kindly revert back.
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
-            <field name="name">For Odoo book</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>Thanks for showing interest and buying the Odoo book.</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
         </record>
 
          <record id="email_template_5" model="mail.template">
+            <field name="name">Lead Automation: technical training to gold partners</field>
             <field name="subject">Propose a free technical training to Gold partners</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;We have very good offer that might suit you.
-            For our gold partners,We are arranging free technical training on june,2015.&lt;/p&gt;
-            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
-            <field name="name">technical training to gold partners</field>
+            <field name="model_id" ref="crm.model_crm_lead"/>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>We have very good offer that might suit you. For our gold partners we are
+arranging free technical training on June 2016.</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
         </record>
 
           <record id="email_template_6" model="mail.template">
+            <field name="name">Lead Automation: training to silver partners</field>
             <field name="subject">Propose paid training to Silver partners</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;We have very good offer that might suit you.
-            For our silver partners,We are  paid technical training on june,2015.&lt;/p&gt;
-            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
-            <field name="name">training to silver partners</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>We have very good offer that might suit you. For our silver partners we are 
+arranging a paid technical training on June 2016.</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
         </record>
 
         <record id="email_template_7" model="mail.template">
+            <field name="name">Lead Automation: gold partnership to silver partners</field>
             <field name="subject">Propose gold partnership to silver partners</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;We have very good offer that might suit you.
-            For our silver partners, we are  offering Gold partnership.&lt;/p&gt;
-            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
-            <field name="name">gold partnership to silver partners</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>We have very good offer that might suit you. For our silver partners, we are
+offering Gold partnership.</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
         </record>
 
         <record id="email_template_8" model="mail.template">
+            <field name="name">Lead Automation: subscribing to technical training</field>
             <field name="subject">Thanks for subscribing to technical training</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;Thanks for showing interest and for subscribing to technical training.&lt;/p&gt;
-            If any further information required kindly revert back.I really appreciate your co-operation on this.&lt;/p&gt;
-            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
-            <field name="name">subscribing to technical training</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>Thanks for showing interest and for subscribing to technical training.</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
         </record>
 
         <record id="email_template_9" model="mail.template">
+            <field name="name">Lead Automation: Propose 1 month OnDemand trial</field>
             <field name="subject">1 month free trial for an OnDemand offer</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;It seems Odoo could do a lot for you. Would you be interested in a free trial of our OnDemand offer?&lt;/p&gt;
-            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
-            <field name="name">Propose 1 month OnDemand trial</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>It seems Odoo could do a lot for you. Would you be interested in a free trial of our OnDemand offer?</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
         </record>
 
         <record id="email_template_10" model="mail.template">
+            <field name="name">Lead Automation: Propose Odoo Book</field>
             <field name="subject">Odoo Book</field>
-            <field name="email_to">info@openerp.com</field>
-            <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For Odoo OnDemand Free Trial 2015 Mail Form')]"/>
-            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For Odoo OnDemand Free Trial 2015)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
-            <field eval="0" name="user_signature"/>
-            <field name="body_html">&lt;p&gt;Hello,&lt;/p&gt;
-            &lt;p&gt;Would you be interested in buying our book? It contains a lot of useful functionnal information to perfect your Odoo training.&lt;/p&gt;
-            &lt;p&gt;If any further information is required, do not hesitate to reply to this message.&lt;/p&gt;
-            &lt;p&gt;Regards,Odoo Team&lt;/p&gt;</field>
-            <field name="name">Propose Odoo Book</field>
+            <field name="body_html"><![CDATA[
+<p>Hello,</p>
+<p>Would you be interested in buying our book? It contains a lot of useful
+functionnal information to perfect your Odoo training.</p>
+<p>If any further information is required, do not hesitate to reply to this message.</p>
+<p>Regards,</p>]]></field>
         </record>
 
     <!-- Campaign -->
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index deaba0bebf2..fdd9b88556a 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -8,48 +8,36 @@
         </record>
 
         <record id="mail_template_data_portal_welcome" model="mail.template">
-            <field name="name">Welcome New Portal User</field>
+            <field name="name">Portal: new user</field>
             <field name="model_id" ref="portal.model_portal_wizard_user"/>
-            <field name="email_from">${(user.email or '')|safe}</field>
             <field name="email_to">${object.partner_id.email}</field>
             <field name="subject">Your Odoo account at ${user.company_id.name|safe}</field>
             <field name="lang">${object.partner_id.lang}</field>
             <field name="auto_delete" eval="True"/>
             <field name="user_signature" eval="True"/>
             <field name="body_html"><![CDATA[
-            	<p>
-                    Dear ${object.user_id.name or ''},
-                </p>
-                <p>
-                    You have been given access to ${user.company_id.name}'s ${object.wizard_id.portal_id.name}.
-                </p>
-                <p>
-                    Your login account data is:
-                </p>
-                <ul>
-                    <li>Username: ${object.user_id.login or ''}</li>
-                </ul>
-                <ul>
-                    <li>Portal: <a href="${'portal_url' in ctx and ctx['portal_url'] or ''}">${'portal_url' in ctx and ctx['portal_url'] or ''}</a></li>
-                </ul>
-                <ul>
-                	<li>Database: ${'dbname' in ctx and ctx['dbname'] or ''}</li>
-                </ul>
-                <p>
-                	You can set or change your password via the following url:
-                </p>
-                <ul>
-                    <li><a href="${object.user_id.signup_url}">${object.user_id.signup_url}</a></li>
-                </ul>
-                <p>
-                	${object.wizard_id.welcome_message or ''}
-                </p>
-                <p>---<br />
-                    Odoo - Open Source Business Applications<br />
-                    http://www.odoo.com<br />
-                </p>
-            ]]>
-            </field>
+<p>
+    Dear ${object.user_id.name or ''},
+</p>
+<p>
+    You have been given access to ${user.company_id.name}'s ${object.wizard_id.portal_id.name}.
+</p>
+<p>
+    Your login account data is:
+</p>
+<ul>
+    <li>Username: ${object.user_id.login or ''}</li>
+    <li>Portal: <a href="${'portal_url' in ctx and ctx['portal_url'] or ''}">${'portal_url' in ctx and ctx['portal_url'] or ''}</a></li>
+	<li>Database: ${'dbname' in ctx and ctx['dbname'] or ''}</li>
+</ul>
+<p>
+	You can set or change your password via the following url:
+</p>
+<ul>
+    <li><a href="${object.user_id.signup_url}">${object.user_id.signup_url}</a></li>
+</ul>
+<p>
+${object.wizard_id.welcome_message or ''}]]></field>
         </record>
     </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_email_compose_message.xml b/addons/survey/wizard/survey_email_compose_message.xml
index 2136473883e..cf88509fc2a 100644
--- a/addons/survey/wizard/survey_email_compose_message.xml
+++ b/addons/survey/wizard/survey_email_compose_message.xml
@@ -8,12 +8,10 @@
             <field name="auto_delete" eval="True" />
             <field name="body_html">
                 <![CDATA[
-                <div style="font-family: 'Lucida Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); ">
-                    <p>Hello,</p>
-                    <p>We are conducting a survey, and your response would be appreciated.</p>
-                    <p><a href="__URL__">Please, click here to start survey</a></p>
-                    <p>Thanks for your participation!</p>
-                </div>
+<p>Hello,</p>
+<p>We are conducting a survey, and your response would be appreciated.</p>
+<p><a style="margin-left: 85px; padding:5px 10px; border-radius: 3px; background-color:#a24689; text-align:center; text-decoration:none; color:#F7FBFD;" href="__URL__">Please, click here to start survey</a></p>
+<p>Thanks for your participation!</p>
                 ]]>
             </field>
         </record>