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 @@ - Reset Password + Auth Signup: Reset Password ]]> ${object.email|safe} Password reset A password reset was requested for the Odoo account linked to this email.

- -

You may change your password by following this link, which will remain valid during 24 hours.

- -

Note: If you do not expect this, you can safely ignore this email.

]]> +
+ + + + +
+ ${user.company_id.name} +
+
+
+

Dear ${object.name},

+

A password reset was requested for the Odoo account linked to this email.

+

You may change your password by following this link which will remain valid during 24 hours:

+
+ Change password +
+

If you do not expect this, you can safely ignore this email.

+

Best regards,

+
+
+ ${user.signature | safe} +

+ Sent by ${user.company_id.name} using Odoo +

+
]]> + - Odoo Enterprise Connection + Auth Signup: Odoo Connection ]]> ${object.email|safe} - - - ${object.name}, -

-

- You have been invited to connect to "${object.company_id.name}" in order to get access to your documents in Odoo. -

-

- To accept the invitation, click on the following link: -

- -

- Thanks, -

- 
---
-${object.company_id.name or ''}
-${object.company_id.email or ''}
-${object.company_id.phone or ''}
-
- ]]> - + + + + + +
+ ${user.company_id.name} +
+ +
+

Dear ${object.name},

+

+ You have been invited to connect to "${object.company_id.name}" in order to get access to your documents in Odoo. +

+

+ To accept the invitation, click on the following link: +

+
+ Accept invitation to "${object.company_id.name}" +
+

Best regards,

+
+
+ ${user.signature | safe} +

+ Sent by ${user.company_id.name} using Odoo +

+
]]> + 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 @@ - Reminder to User + Lead: Reminder admin@example.com ${(object.user_id != False and object.user_id.email)|safe} - Reminder on Lead: ${object.id} from ${object.partner_id != False and object.partner_id.name or object.contact_name} - This opportunity did not have any activity since at least 5 days. Here are some details:

-
    -
  • Name: ${object.name}
    • -
  • ID: ${object.id}
    • -
  • Description: ${object.description}
    • -
]]> + Reminder: Lead ${object.name} from ${object.partner_id != False and object.partner_id.name or object.contact_name} + Hello ${object.user_id and object.user_id.name or ''},

+

The opportunity ${object.name} did not have any activity since at least 5 days.

+%if object.description: +

Here is the description about the opportunity :

${object.description} +%endif +

Thank you!

+]]> 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 @@ Event: Registration Badge ${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe} - ${object.email|safe} + ${object.partner_id.email or object.email|safe} ${object.partner_id.lang} Your badge for ${object.event_id.name} badge_of_${(object.event_id.name or '').replace('/','_')} - Hello ${object.name},

-

We confirm that your subscription to the event ${object.event_id.name} has been recorded. -Please, Find your Event Badge attached with this mail.

-

Thank you for your participation!

-

Best regards

]]> + Dear ${object.name},

+

Thank you for your inquiry.

+

Here is your badge for the event ${object.event_id.name}.

+

If you have any questions, please let us know.

+

Best regards,

]]> - Event subscription + Event: Subscription ${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe} - ${object.email|safe} + ${object.partner_id.email or object.email|safe} ${object.partner_id.lang} ${object.event_id.reply_to|safe} Your subscription at ${object.event_id.name} - Hello ${object.name},

-

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.

-

Thank you for your participation!

-

Best regards

]]> + Dear ${object.name},

+

Thank you for your inquiry.

+

We confirm your subscription to the event ${object.event_id.name}. You will receive emails with practical information.

+

If you have any questions, please let us know.

+

Best regards,

]]> - Event: reminder + Event: Reminder ${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe} ${object.partner_id.email or object.email|safe} ${object.partner_id.lang} ${object.event_id.reply_to|safe} Reminder of event ${object.event_id.name} - Hello ${object.name},

-

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.

-

Thank you for your participation!

-

Best regards

]]> - - - - Event: thanks for attending - - ${(object.event_id.organizer_id.email or object.event_id.user_id.email or '')|safe} - ${object.partner_id.email or object.email|safe} - ${object.partner_id.lang} - ${object.event_id.reply_to|safe} - Thanks for attending ${object.event_id.name} - Hello ${object.name},

-

We would like to thank you for your presence at our event ${object.event_id.name}. -

- % if object.event_id.organizer_id and object.event_id.organizer_id.is_company: - The ${object.event_id.organizer_id.name} Team - % elif object.event_id.organizer_id: - ${object.event_id.organizer_id.name} - % endif -

]]> + Dear ${object.name},

+

Thank you for your registration to the event ${object.event_id.name}.

+

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

+

If you have any questions, please let us know.

+

Best regards,

]]> 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 @@ Badge Granted - Received Badge 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 @@ ${object.user_id.lang} +

Reminder ${object.name} - +

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.

]]> @@ -21,9 +21,9 @@ Simple Challenge Report Progress +

${object.name} - +

The following message contains the current progress for the challenge ${object.name}

% 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 @@ - - Application refused + + Applicant: Refuse Application refused ${object.email_from} ${object.partner_id and object.partner_id.id or ''} ${object.partner_id and object.partner_id.lang or ''} - - Dear ${object.partner_name or 'applicant'},

-

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.

-

If you want more details, feel free to contact us by phone.

-

Kind regards,

-
- ${object.user_id and object.user_id.signature | safe or ''}]]> - - - - Welcome New Employee - - Welcoming ${object.name} + - %if object.department_id: - I’m very pleased to announce that ${object.name} will be joining us as a ${object.job_id.name} - in ${object.department_id.name}. - %else: - I’m very pleased to announce that ${object.name} will be joining us as a ${object.job_id.name}. - %endif -

-

Please welcome him/her and help him/her finding his/her marks.

- ]]> +

Dear ${object.partner_name or 'applicant'},

+

Thank you for your enquiry.
+Unfortunately, your profile does not match with our needs

+

If you have any questions, please let us know.

+

Best regards,

]]> - - Application approved + + Applicant: Interest Application approved ${object.email_from} ${object.partner_id and object.partner_id.id or ''} ${object.partner_id and object.partner_id.lang or ''} - - Dear ${object.partner_name or 'applicant'},

-

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.

-

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.

-

Kind regards,

-
- ${object.user_id.signature | safe}]]> + + Dear ${object.partner_name or 'applicant'},

+

Thank you for your enquiry.
+Your resume got our interest. I will contact you as soon as possible to plan +next steps of the recruitment process.

+

If you have any questions, please let us know.

+

Best regards,

]]> + + + + Applicant: Welcome new employee + Welcome ${object.name} + + Dear all,

+

I’m very pleased to announce that ${object.name} will be +joining us as a ${object.job_id.name} +%if object.department_id: + in ${object.department_id.name}. +%endif +.

+

Please welcome him/her and help him/her finding his/her marks.

]]> 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 @@ First Interview - + 2 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 @@ Welcome to the Odoo Partner Channel! ${(object.email or '')|safe} - Hello, you will receive your welcome pack via email shortly. + Hello,

+

You will receive your welcome pack via email shortly.

+

Thank you,

+]]> congrats silver partner @@ -15,7 +19,11 @@ Congratulations! You are now a Silver Partner! ${(object.email or '')|safe} - Hi, we are delighted to welcome you among our Silver Partners as of today! + Hello,

+

We are delighted to welcome you among our Silver Partners as of today!

+

Thank you,

+]]> @@ -24,7 +32,11 @@ Congratulations! You are now one of our Gold Partners! ${(object.email or '')|safe} - Hi, we are delighted to let you know that you have entered the select circle of our Gold Partners + Hello,

+

We are delighted to let you know that you have entered the select circle of our Gold Partners!

+

Thank you,

+]]> 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 @@ + Lead Automation: For Odoo OnDemand Free Trial 2015 Thanks for showing interest in Odoo - info@openerp.com - - - - <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,Odoo Team</p> - For Odoo OnDemand Free Trial 2015 + Hello,

+

Thanks for the genuine interest you have shown in Odoo.

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> + Lead Automation: For Odoo Discovery Day on May 2015 Propose to subscribe to the Odoo Discovery Day on May 2015 - info@openerp.com - - - - <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,Odoo Team</p> - For Odoo Discovery Day on May 2015 + Hello,

+

We have very good offer that might suit you. We suggest you subscribe to the +Odoo Discovery Day on May 2015.

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> - Thanks for subscribing to the Odoo Discovery Day - info@openerp.com - - + Lead Automation: Thanks for subscribing to the Odoo Discovery Day - - <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,Odoo Team</p> + Hello,

+

Thanks for showing interest and for subscribing to the Odoo Discovery Day.

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> For Odoo Discovery Day + Lead Automation: For Odoo book Thanks for buying the Odoo book - info@openerp.com - - - - - <p>Hello,</p> - <p>Thanks for showing interest and buying the Odoo book.</p> - If any further information required kindly revert back. - <p>Regards,Odoo Team</p> - For Odoo book + + Hello,

+

Thanks for showing interest and buying the Odoo book.

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> + Lead Automation: technical training to gold partners Propose a free technical training to Gold partners - info@openerp.com - - - - <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,2015.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,Odoo Team</p> - technical training to gold partners + + Hello,

+

We have very good offer that might suit you. For our gold partners we are +arranging free technical training on June 2016.

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> + Lead Automation: training to silver partners Propose paid training to Silver partners - info@openerp.com - - - - <p>Hello,</p> - <p>We have very good offer that might suit you. - For our silver partners,We are paid technical training on june,2015.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,Odoo Team</p> - training to silver partners + Hello,

+

We have very good offer that might suit you. For our silver partners we are +arranging a paid technical training on June 2016.

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> + Lead Automation: gold partnership to silver partners Propose gold partnership to silver partners - info@openerp.com - - - - <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,Odoo Team</p> - gold partnership to silver partners + Hello,

+

We have very good offer that might suit you. For our silver partners, we are +offering Gold partnership.

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> + Lead Automation: subscribing to technical training Thanks for subscribing to technical training - info@openerp.com - - - - <p>Hello,</p> - <p>Thanks for showing interest and for subscribing to technical training.</p> - If any further information required kindly revert back.I really appreciate your co-operation on this.</p> - <p>If any further information is required, do not hesitate to reply to this message.</p> - <p>Regards,Odoo Team</p> - subscribing to technical training + Hello,

+

Thanks for showing interest and for subscribing to technical training.

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> + Lead Automation: Propose 1 month OnDemand trial 1 month free trial for an OnDemand offer - info@openerp.com - - - - <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,Odoo Team</p> - Propose 1 month OnDemand trial + Hello,

+

It seems Odoo could do a lot for you. Would you be interested in a free trial of our OnDemand offer?

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> + Lead Automation: Propose Odoo Book Odoo Book - info@openerp.com - - - - <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,Odoo Team</p> - Propose Odoo Book + Hello,

+

Would you be interested in buying our book? It contains a lot of useful +functionnal information to perfect your Odoo training.

+

If any further information is required, do not hesitate to reply to this message.

+

Regards,

]]> 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 @@ - Welcome New Portal User + Portal: new user - ${(user.email or '')|safe} ${object.partner_id.email} Your Odoo account at ${user.company_id.name|safe} ${object.partner_id.lang} - Dear ${object.user_id.name or ''}, -

-

- You have been given access to ${user.company_id.name}'s ${object.wizard_id.portal_id.name}. -

-

- Your login account data is: -

-
    -
  • Username: ${object.user_id.login or ''}
    • -
- -
    -
  • Database: ${'dbname' in ctx and ctx['dbname'] or ''}
    • -
-

- You can set or change your password via the following url: -

- -

- ${object.wizard_id.welcome_message or ''} -

-

---
- Odoo - Open Source Business Applications
- http://www.odoo.com
-

- ]]> - +

+ Dear ${object.user_id.name or ''}, +

+

+ You have been given access to ${user.company_id.name}'s ${object.wizard_id.portal_id.name}. +

+

+ Your login account data is: +

+ +

+ You can set or change your password via the following url: +

+ +

+${object.wizard_id.welcome_message or ''}]]> 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 @@ -

Hello,

-

We are conducting a survey, and your response would be appreciated.

-

Please, click here to start survey

-

Thanks for your participation!

- +

Hello,

+

We are conducting a survey, and your response would be appreciated.

+

Please, click here to start survey

+

Thanks for your participation!

]]>