diff --git a/addons/account/data/invoice_action_data.xml b/addons/account/data/invoice_action_data.xml index 54036f299e3..0aa82409d95 100644 --- a/addons/account/data/invoice_action_data.xml +++ b/addons/account/data/invoice_action_data.xml @@ -16,10 +16,10 @@ Invoice_${(object.number or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} ${object.partner_id.lang} Dear ${object.partner_id.name} % set access_action = object.get_access_action() % set access_url = access_action['type'] == 'ir.actions.act_url' and access_action['url'] or '/report/pdf/account.report_invoice/' + str(object.id) -

Dear ${object.partner_id.name} % if object.partner_id.parent_id: (${object.partner_id.parent_id.name}) % endif diff --git a/addons/calendar/data/calendar_data.xml b/addons/calendar/data/calendar_data.xml index 1143e7439d7..80e96125b2d 100644 --- a/addons/calendar/data/calendar_data.xml +++ b/addons/calendar/data/calendar_data.xml @@ -81,8 +81,8 @@ ${object.partner_id and object.partner_id.email and object.partner_id.email==object.email and object.partner_id.id or False } +% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}
@@ -172,8 +172,8 @@ ${object.partner_id and object.partner_id.email and object.partner_id.email==object.email and object.partner_id.id or False } +% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}
@@ -264,8 +264,8 @@ ${object.partner_id and object.partner_id.email and object.partner_id.email==object.email and object.partner_id.id or False } +% set colors = {'needsAction': 'grey', 'accepted': 'green', 'tentative': '#FFFF00', 'declined': 'red'}
diff --git a/addons/crm/data/mail_template_data.xml b/addons/crm/data/mail_template_data.xml index bd9407e1cf1..2797493b1f3 100644 --- a/addons/crm/data/mail_template_data.xml +++ b/addons/crm/data/mail_template_data.xml @@ -12,9 +12,9 @@ ${(datetime.datetime.now() + relativedelta(days=2)).strftime('%Y-%m-%d %H:%M')} + % set last_created_team = user.env['crm.team'].search([], order="create_date desc")[0] diff --git a/addons/event/data/email_template_data.xml b/addons/event/data/email_template_data.xml index aa49de0995c..cd675b35a69 100644 --- a/addons/event/data/email_template_data.xml +++ b/addons/event/data/email_template_data.xml @@ -29,9 +29,9 @@ ${object.event_id.reply_to|safe}Your registration at ${object.event_id.name} % set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ') % set date_end = format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%SZ') -
@@ -157,9 +157,9 @@ ${object.event_id.reply_to|safe}Reminder for ${object.event_id.name} % set date_begin = format_tz(object.event_id.date_begin, tz='UTC', format='%Y%m%dT%H%M%SZ') % set date_end = format_tz(object.event_id.date_end, tz='UTC', format='%Y%m%dT%H%M%SZ') -
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index 1aa23023ee7..874f83d9af1 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -60,6 +60,7 @@ % if ctx.get('button_access'):
@@ -140,7 +141,7 @@ ${object.body | safe} using Odoo.

-]]> +
]]> diff --git a/addons/project/data/project_mail_template_data.xml b/addons/project/data/project_mail_template_data.xml index 7c045d2b635..db637646b85 100644 --- a/addons/project/data/project_mail_template_data.xml +++ b/addons/project/data/project_mail_template_data.xml @@ -12,9 +12,8 @@ ${(datetime.datetime.now() + relativedelta(days=3)).strftime('%Y-%m-%d %H:%M')} ',False)], order="create_date desc")[0] -
+ % set last_created_project = user.env['project.project'].search([('alias_id','!=',False)], order="create_date desc")[0]
diff --git a/addons/rating_project/data/project_data.xml b/addons/rating_project/data/project_data.xml index 36aef4f101d..9b211a31544 100644 --- a/addons/rating_project/data/project_data.xml +++ b/addons/rating_project/data/project_data.xml @@ -33,8 +33,8 @@ ${object.rating_get_partner_id().id} + % set access_token = object.rating_get_access_token()
diff --git a/addons/sale/data/mail_template_data.xml b/addons/sale/data/mail_template_data.xml index da17da2a808..1f9895b19f4 100644 --- a/addons/sale/data/mail_template_data.xml +++ b/addons/sale/data/mail_template_data.xml @@ -14,12 +14,13 @@ ${(object.name or '').replace('/','_')}_${object.state == 'draft' and 'draft' or ''} ${object.partner_id.lang} Dear ${object.partner_id.name} % set access_action = object.get_access_action() % set doc_name = 'quotation' if object.state in ('draft', 'sent') else 'order confirmation' % 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 ${object.partner_id.name} + % if object.partner_id.parent_id: (${object.partner_id.parent_id.name}) % endif