Once your Expense is ready, you can save it.
"), + content: Markup(_t("Once your Expense is ready, you can save it.
")), position: 'bottom', }, { trigger: '.o_attach_document', @@ -29,28 +28,28 @@ tour.register('hr_expense_tour' , { }, { trigger: '.o_expense_submit', extra_triggger: ".o_expense_form", - content: _t('Click on Create Report to create the report.
'), + content: Markup(_t('Click on Create Report to create the report.
')), position: 'right', }, { trigger: '.o_expense_tree input[type=checkbox]', - content: _t('Select expenses to submit them to your manager
'), + content: Markup(_t('Select expenses to submit them to your manager
')), position: 'bottom' }, { trigger: '.o_dropdown_toggler', extra_trigger: ".o_expense_tree", - content: _t('Click on Action Create Report to submit selected expenses to your manager
'), + content: Markup(_t('Click on Action Create Report to submit selected expenses to your manager
')), position: 'right', }, { trigger: '.o_expense_sheet_submit', - content: _t('Once your Expense report is ready, you can submit it to your manager and wait for the approval from your manager.'), + content: Markup(_t('Once your Expense report is ready, you can submit it to your manager and wait for the approval from your manager.')), position: 'bottom', }, { trigger: '.o_expense_sheet_approve', - content: _t("Approve the report here.
Tip: if you refuse, don’t forget to give the reason thanks to the hereunder message tool
"), + content: Markup(_t("Approve the report here.
Tip: if you refuse, don’t forget to give the reason thanks to the hereunder message tool
")), position: 'bottom', }, { trigger: '.o_expense_sheet_post', - content: _t("The accountant receive approved expense reports.
He can post journal entries in one click if taxes and accounts are right.
"), + content: Markup(_t("The accountant receive approved expense reports.
He can post journal entries in one click if taxes and accounts are right.
")), position: 'bottom', }, { trigger: '.o_expense_sheet_pay', diff --git a/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js b/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js index e2bb77bfe61..0b2874f5fd4 100644 --- a/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js +++ b/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js @@ -1,11 +1,10 @@ odoo.define('hr_recruitment.tour', function(require) { "use strict"; -var core = require('web.core'); +const {_t} = require('web.core'); +const {Markup} = require('web.utils'); var tour = require('web_tour.tour'); -var _t = core._t; - tour.register('hr_recruitment_tour',{ url: "/web", rainbowManMessage: _t("Great job! You hired a new colleague!
Try the Website app to publish job offers online.
"),
@@ -13,12 +12,12 @@ tour.register('hr_recruitment_tour',{
sequence: 230,
}, [tour.stepUtils.showAppsMenuItem(), {
trigger: '.o_app[data-menu-xmlid="hr_recruitment.menu_hr_recruitment_root"]',
- content: _t("Let's have a look at how to improve your hiring process."),
+ content: Markup(_t("Let's have a look at how to improve your hiring process.")),
position: 'right',
edition: 'community'
}, {
trigger: '.o_app[data-menu-xmlid="hr_recruitment.menu_hr_recruitment_root"]',
- content: _t("Let's have a look at how to improve your hiring process."),
+ content: Markup(_t("Let's have a look at how to improve your hiring process.")),
position: 'bottom',
edition: 'enterprise'
}, {
@@ -62,24 +61,24 @@ tour.register('hr_recruitment_tour',{
}, {
trigger: ".oe_kanban_action_button",
extra_trigger: '.o_hr_recruitment_kanban',
- content: _t("Did you apply by sending an email? Check incoming applications."),
+ content: Markup(_t("Did you apply by sending an email? Check incoming applications.")),
position: "bottom"
}, {
trigger: ".oe_kanban_card",
extra_trigger: '.o_kanban_applicant',
- content: _t("Drag this card, to qualify him for a first interview."),
+ content: Markup(_t("Drag this card, to qualify him for a first interview.")),
position: "bottom",
run: "drag_and_drop .o_kanban_group:eq(1) ",
}, {
trigger: ".oe_kanban_card",
extra_trigger: '.o_kanban_applicant',
- content: _t("Click to view the application."),
+ content: Markup(_t("Click to view the application.")),
position: "bottom",
width: 195
}, {
trigger: ".o_Chatter .o_ChatterTopbar_buttonSendMessage",
extra_trigger: '.o_applicant_form',
- content: _t("Try to send an email to the applicant.
Tips: All emails sent or received are saved in the history here"),
+ content: Markup(_t("
diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js
index eb87a819ede..4bc4761fc62 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -539,109 +539,6 @@ var BasicActivity = AbstractField.extend({
},
});
-// -----------------------------------------------------------------------------
-// Activities Widget for Form views ('mail_activity' widget)
-// -----------------------------------------------------------------------------
-// FIXME seems to still be needed in some cases like systray
-var Activity = BasicActivity.extend({
- className: 'o_mail_activity',
- events: _.extend({}, BasicActivity.prototype.events, {
- 'click a': '_onClickRedirect',
- }),
- specialData: '_fetchSpecialActivity',
- /**
- * @override
- */
- init: function () {
- this._super.apply(this, arguments);
- this._activities = this.record.specialData[this.name];
- },
- /**
- * @override
- */
- destroy: function () {
- this._unbindOnUploadAction();
- return this._super.apply(this, arguments);
- },
-
- //------------------------------------------------------------
- // Private
- //------------------------------------------------------------
- /**
- * @private
- * @param {Object} fieldsToReload
- */
- _reload: function (fieldsToReload) {
- this.trigger_up('reload_mail_fields', fieldsToReload);
- },
- /**
- * @override
- * @private
- */
- _render: function () {
- _.each(this._activities, function (activity) {
- var note = mailUtils.parseAndTransform(activity.note || '', mailUtils.inline);
- var is_blank = (/^\s*$/).test(note);
- if (!is_blank) {
- activity.note = mailUtils.parseAndTransform(activity.note, mailUtils.addLink);
- } else {
- activity.note = '';
- }
- });
- var activities = setFileUploadID(setDelayLabel(this._activities));
- if (activities.length) {
- var nbActivities = _.countBy(activities, 'state');
- this.$el.html(QWeb.render('mail.activity_items', {
- uid: session.uid,
- activities: activities,
- nbPlannedActivities: nbActivities.planned,
- nbTodayActivities: nbActivities.today,
- nbOverdueActivities: nbActivities.overdue,
- dateFormat: time.getLangDateFormat(),
- datetimeFormat: time.getLangDatetimeFormat(),
- session: session,
- widget: this,
- }));
- this._bindOnUploadAction(this._activities);
- } else {
- this._unbindOnUploadAction(this._activities);
- this.$el.empty();
- }
- },
- /**
- * @override
- * @private
- * @param {Object} record
- */
- _reset: function (record) {
- this._super.apply(this, arguments);
- this._activities = this.record.specialData[this.name];
- // the mail widgets being persistent, one need to update the res_id on reset
- this.res_id = record.res_id;
- },
-
- //------------------------------------------------------------
- // Handlers
- //------------------------------------------------------------
-
- /**
- * @private
- * @param {MouseEvent} ev
- */
- _onClickRedirect: function (ev) {
- var id = $(ev.currentTarget).data('oe-id');
- if (id) {
- ev.preventDefault();
- var model = $(ev.currentTarget).data('oe-model');
- this.trigger_up('redirect', {
- res_id: id,
- res_model: model,
- });
- }
- },
-
-});
-
// -----------------------------------------------------------------------------
// Activities Widget for Kanban views ('kanban_activity' widget)
// -----------------------------------------------------------------------------
@@ -861,5 +758,3 @@ field_registry
.add('kanban_activity', KanbanActivity)
.add('list_activity', ListActivity)
.add('activity_exception', ActivityException);
-
-export default Activity;
diff --git a/addons/mail/static/src/js/tours/mail.js b/addons/mail/static/src/js/tours/mail.js
index 90b6a49ad62..85b16cc592b 100644
--- a/addons/mail/static/src/js/tours/mail.js
+++ b/addons/mail/static/src/js/tours/mail.js
@@ -1,20 +1,19 @@
/** @odoo-module **/
-import core from 'web.core';
+import {_t} from 'web.core';
+import {Markup} from 'web.utils';
import tour from 'web_tour.tour';
-var _t = core._t;
-
tour.register('mail_tour', {
url: "/web#action=mail.widgets.discuss",
sequence: 80,
}, [{
trigger: '.o_DiscussSidebar_groupChannel .o_DiscussSidebar_groupHeaderItemAdd',
- content: _t("Try to send an email to the applicant.
Tips: All emails sent or received are saved in the history here")),
position: "bottom"
}, {
trigger: ".o_Chatter .o_Composer_buttonSend",
diff --git a/addons/im_livechat/static/src/legacy/public_livechat.js b/addons/im_livechat/static/src/legacy/public_livechat.js
index 25445bde1ea..509fccd23d6 100644
--- a/addons/im_livechat/static/src/legacy/public_livechat.js
+++ b/addons/im_livechat/static/src/legacy/public_livechat.js
@@ -71,31 +71,25 @@ var LivechatButton = Widget.extend({
this._messages = [];
this._serverURL = serverURL;
},
- willStart: function () {
- var self = this;
+ async willStart() {
var cookie = utils.get_cookie('im_livechat_session');
- var ready;
- if (!cookie) {
- ready = session.rpc('/im_livechat/init', { channel_id: this.options.channel_id })
- .then(function (result) {
- if (!result.available_for_me) {
- return Promise.reject();
- }
- self._rule = result.rule;
- });
- } else {
+ if (cookie) {
var channel = JSON.parse(cookie);
- ready = session.rpc('/mail/chat_history', { uuid: channel.uuid, limit: 100 })
- .then(function (history) {
- self._history = history;
- });
+ this._history = await session.rpc('/mail/chat_history', {uuid: channel.uuid, limit: 100});
+ this._history.reverse().forEach(message => { message.body = utils.Markup(message.body); });
+ } else {
+ const result = await session.rpc('/im_livechat/init', {channel_id: this.options.channel_id});
+ if (!result.available_for_me) {
+ return Promise.reject();
+ }
+ this._rule = result.rule;
}
- return ready.then(this._loadQWebTemplate.bind(this));
+ return this._loadQWebTemplate();
},
start: function () {
this.$el.text(this.options.button_text);
if (this._history) {
- _.each(this._history.reverse(), this._addMessage.bind(this));
+ this._history.forEach(m => this._addMessage(m));
this._openChat();
} else if (!config.device.isMobile && this._rule.action === 'auto_popup') {
var autoPopupCookie = utils.get_cookie('im_livechat_auto_popup');
@@ -204,6 +198,7 @@ var LivechatButton = Widget.extend({
if (this._messages.some(message => message.getID() === notificationData.id)) {
return;
}
+ notificationData.body = utils.Markup(notificationData.body);
this._addMessage(notificationData);
if (this._chatWindow.isFolded() || !this._chatWindow.isAtBottom()) {
this._livechat.incrementUnreadCounter();
diff --git a/addons/im_livechat/static/src/legacy/public_livechat.xml b/addons/im_livechat/static/src/legacy/public_livechat.xml
index b5cf12a6ff8..1250bcf4e5a 100644
--- a/addons/im_livechat/static/src/legacy/public_livechat.xml
+++ b/addons/im_livechat/static/src/legacy/public_livechat.xml
@@ -400,7 +400,7 @@
@@ -165,7 +165,7 @@
-
-
+
Channels make it easy to organize information across different topics and groups.
Try to create your first channel (e.g. sales, marketing, product XYZ, after work party, etc).
"), + content: Markup(_t("Channels make it easy to organize information across different topics and groups.
Try to create your first channel (e.g. sales, marketing, product XYZ, after work party, etc).
")), position: 'bottom', }, { trigger: '.o_DiscussSidebar_itemNewInput', - content: _t("Create a channel here.
"), + content: Markup(_t("Create a channel here.
")), position: 'bottom', auto: true, run: function (actions) { @@ -23,14 +22,14 @@ tour.register('mail_tour', { }, }, { trigger: ".o_DiscussSidebar_newChannelAutocompleteSuggestions", - content: _t("Create a public or private channel.
"), + content: Markup(_t("Create a public or private channel.
")), position: 'right', run() { this.$consumeEventAnchors.find('li:first').click(); }, }, { trigger: '.o_Discuss_thread .o_ComposerTextInput_textarea', - content: _t("Write a message to the members of the channel here.
You can notify someone with '@' or link another channel with '#'. Start your message with '/' to get the list of possible commands.
"), + content: Markup(_t("Write a message to the members of the channel here.
You can notify someone with '@' or link another channel with '#'. Start your message with '/' to get the list of possible commands.
")), position: "top", width: 350, run: function (actions) { @@ -43,7 +42,7 @@ tour.register('mail_tour', { position: "top", }, { trigger: '.o_Discuss_thread .o_Message_commandStar', - content: _t("Messages can be starred to remind you to check back later."), + content: Markup(_t("Messages can be starred to remind you to check back later.")), position: "bottom", }, { trigger: '.o_DiscussSidebarItem.o-starred-box', @@ -51,6 +50,6 @@ tour.register('mail_tour', { position: "bottom", }, { trigger: '.o_DiscussSidebar_groupChat .o_DiscussSidebar_groupHeaderItemAdd', - content: _t("Chat with coworkers in real-time using direct messages.
You might need to invite users from the Settings app first.
"), + content: Markup(_t("Chat with coworkers in real-time using direct messages.
You might need to invite users from the Settings app first.
")), position: 'bottom', }]); diff --git a/addons/mail/static/src/widgets/discuss_invite_partner_dialog/discuss_invite_partner_dialog.js b/addons/mail/static/src/widgets/discuss_invite_partner_dialog/discuss_invite_partner_dialog.js index 479bc7f583d..c2c5f5bc936 100644 --- a/addons/mail/static/src/widgets/discuss_invite_partner_dialog/discuss_invite_partner_dialog.js +++ b/addons/mail/static/src/widgets/discuss_invite_partner_dialog/discuss_invite_partner_dialog.js @@ -30,7 +30,7 @@ const PartnerInviteDialog = Dialog.extend({ this.channelId = channel.id; this.env = env; this._super(parent, { - title: _.str.sprintf(this.env._t("Invite people to #%s"), owl.utils.escape(channel.displayName)), + title: _.str.sprintf(this.env._t("Invite people to #%s"), channel.displayName), size: 'medium', buttons: [{ text: this.env._t("Invite"), diff --git a/addons/mail/static/src/xml/activity.xml b/addons/mail/static/src/xml/activity.xml index ec83191b4fe..74735cf214c 100644 --- a/addons/mail/static/src/xml/activity.xml +++ b/addons/mail/static/src/xml/activity.xml @@ -1,113 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- Activity type -
-
-
-
- - Created on -
-
-
- by - -
-
- - Assigned to -
-
-
-
- , due on -
-
-
-
-
-
-
-
-
- :
- Preview
- or
- Send Now
-
-
diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml
index 49c0a3bf9b4..3fd0b28bd5f 100644
--- a/addons/mail/static/src/xml/composer.xml
+++ b/addons/mail/static/src/xml/composer.xml
@@ -4,7 +4,7 @@
-
diff --git a/addons/maintenance/views/maintenance_views.xml b/addons/maintenance/views/maintenance_views.xml
index e9e20c5b93c..47915998fc0 100644
--- a/addons/maintenance/views/maintenance_views.xml
+++ b/addons/maintenance/views/maintenance_views.xml
@@ -457,10 +457,10 @@
-
diff --git a/addons/payment_ogone/controllers/main.py b/addons/payment_ogone/controllers/main.py
index 11cc2a60a0c..c24e52d220d 100644
--- a/addons/payment_ogone/controllers/main.py
+++ b/addons/payment_ogone/controllers/main.py
@@ -5,6 +5,7 @@ import logging
import pprint
import re
+import markupsafe
import werkzeug
from odoo import _, http
@@ -88,7 +89,7 @@ class OgoneController(http.Controller):
# The content of the HTML is not sanitized to preserve the redirection in the script.
# After redirection, the customer comes back to the directlink return URL and we proceed
# with the (now authenticated) payment request.
- redirect_html = ustr(base64.b64decode(redirect_html_element.text))
+ redirect_html = markupsafe.Markup(ustr(base64.b64decode(redirect_html_element.text)))
return request.render(
'payment_ogone.directlink_feedback', {'redirect_html': redirect_html}
)
diff --git a/addons/payment_ogone/views/payment_ogone_templates.xml b/addons/payment_ogone/views/payment_ogone_templates.xml
index 6fb278c0554..74a6eb2a96b 100644
--- a/addons/payment_ogone/views/payment_ogone_templates.xml
+++ b/addons/payment_ogone/views/payment_ogone_templates.xml
@@ -43,7 +43,7 @@
diff --git a/addons/point_of_sale/static/src/js/tours/point_of_sale.js b/addons/point_of_sale/static/src/js/tours/point_of_sale.js
index 49a6fc0ac3e..37bc8736206 100644
--- a/addons/point_of_sale/static/src/js/tours/point_of_sale.js
+++ b/addons/point_of_sale/static/src/js/tours/point_of_sale.js
@@ -1,30 +1,29 @@
odoo.define('point_of_sale.tour', function(require) {
"use strict";
-var core = require('web.core');
+const {_t} = require('web.core');
+const {Markup} = require('web.utils');
var tour = require('web_tour.tour');
-var _t = core._t;
-
tour.register('point_of_sale_tour', {
url: "/web",
rainbowMan: false,
sequence: 45,
}, [tour.stepUtils.showAppsMenuItem(), {
trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"]',
- content: _t("Ready to launch your point of sale?"),
+ content: Markup(_t("Ready to launch your point of sale?")),
width: 215,
position: 'right',
edition: 'community'
}, {
trigger: '.o_app[data-menu-xmlid="point_of_sale.menu_point_root"]',
- content: _t("Ready to launch your point of sale?"),
+ content: Markup(_t("Ready to launch your point of sale?")),
width: 215,
position: 'bottom',
edition: 'enterprise'
}, {
trigger: ".o_pos_kanban button.oe_kanban_action_button",
- content: _t("
-
-
-
-
diff --git a/addons/mass_mailing/static/src/js/tours/mass_mailing_tour.js b/addons/mass_mailing/static/src/js/tours/mass_mailing_tour.js
index 47dad7b1b24..b9189c261a3 100644
--- a/addons/mass_mailing/static/src/js/tours/mass_mailing_tour.js
+++ b/addons/mass_mailing/static/src/js/tours/mass_mailing_tour.js
@@ -1,8 +1,8 @@
odoo.define('mass_mailing.mass_mailing_tour', function (require) {
"use strict";
- var core = require('web.core');
- var _t = core._t;
+ const {_t} = require('web.core');
+ const {Markup} = require('web.utils');
var tour = require('web_tour.tour');
var now = moment();
@@ -22,11 +22,11 @@ odoo.define('mass_mailing.mass_mailing_tour', function (require) {
edition: 'community',
}, {
trigger: '.o-kanban-button-new',
- content: _t("Start by creating your first Mailing."),
+ content: Markup(_t("Start by creating your first Mailing.")),
position: 'bottom',
}, {
trigger: 'input[name="subject"]',
- content: _t('Pick the email subject.'),
+ content: Markup(_t('Pick the email subject.')),
position: 'right',
run: 'text ' + now.format("MMMM") + " Newsletter",
}, {
@@ -39,13 +39,13 @@ odoo.define('mass_mailing.mass_mailing_tour', function (require) {
auto: true,
}, {
trigger: 'div[name="body_arch"] iframe #newsletter',
- content: _t('Choose this theme.'),
+ content: Markup(_t('Choose this theme.')),
position: 'left',
edition: 'enterprise',
run: 'click',
}, {
trigger: 'div[name="body_arch"] iframe #default',
- content: _t('Choose this theme.'),
+ content: Markup(_t('Choose this theme.')),
position: 'right',
edition: 'community',
run: 'click',
@@ -80,7 +80,7 @@ odoo.define('mass_mailing.mass_mailing_tour', function (require) {
run: "click",
}, {
trigger: '.o_back_button',
- content: _t("By using the Breadcrumb, you can navigate back to the overview."),
+ content: Markup(_t("By using the Breadcrumb, you can navigate back to the overview.")),
position: 'bottom',
run: 'click',
}]
diff --git a/addons/mass_mailing/views/utm_campaign_views.xml b/addons/mass_mailing/views/utm_campaign_views.xml
index ab9a0504f12..99ca2ed3b9e 100644
--- a/addons/mass_mailing/views/utm_campaign_views.xml
+++ b/addons/mass_mailing/views/utm_campaign_views.xml
@@ -84,7 +84,7 @@
-
-
diff --git a/addons/mrp/models/stock_rule.py b/addons/mrp/models/stock_rule.py
index 7ca58c1363a..fc2bb6125ae 100644
--- a/addons/mrp/models/stock_rule.py
+++ b/addons/mrp/models/stock_rule.py
@@ -124,11 +124,11 @@ class StockRule(models.Model):
manufacture_delay = product.produce_delay
delay += manufacture_delay
if not bypass_delay_description:
- delay_description += '%s + %d %s %s + %d %s
-
Your payment is in pending state.
@@ -75,7 +75,7 @@
-
Your payment has been received but need to be confirmed manually.
@@ -100,7 +100,7 @@
-
We are waiting for the payment acquirer to confirm the payment.
diff --git a/addons/payment/views/payment_acquirer_views.xml b/addons/payment/views/payment_acquirer_views.xml
index 4a89136774a..f9b8bf92ac2 100644
--- a/addons/payment/views/payment_acquirer_views.xml
+++ b/addons/payment/views/payment_acquirer_views.xml
@@ -132,7 +132,7 @@
![Acquirer]()
${_.str.escapeHTML(description) || ''}
`, buttons: [{text: _t("Ok"), close: true}] diff --git a/addons/payment/static/src/js/post_processing.js b/addons/payment/static/src/js/post_processing.js index ccc24e211cc..4be04db63cb 100644 --- a/addons/payment/static/src/js/post_processing.js +++ b/addons/payment/static/src/js/post_processing.js @@ -2,8 +2,8 @@ odoo.define('payment.post_processing', function (require) { 'use strict'; var publicWidget = require('web.public.widget'); - var ajax = require('web.ajax'); var core = require('web.core'); + const {Markup} = require('web.utils'); var _t = core._t; @@ -92,6 +92,9 @@ odoo.define('payment.post_processing', function (require) { display_values_list.forEach(function (display_values) { var key = 'tx_' + display_values.state; if(key in render_values) { + if (display_values["display_message"]) { + display_values.display_message = Markup(display_values.display_message) + } render_values[key].push(display_values); } }); diff --git a/addons/payment/static/src/xml/payment_post_processing.xml b/addons/payment/static/src/xml/payment_post_processing.xml index 685122596cf..9c8723f5b64 100644 --- a/addons/payment/static/src/xml/payment_post_processing.xml +++ b/addons/payment/static/src/xml/payment_post_processing.xml @@ -54,7 +54,7 @@@@ -75,7 +75,7 @@
@@ -100,7 +100,7 @@
Ready to have a look at the POS Interface? Let's start our first session.
"), + content: Markup(_t("Ready to have a look at the POS Interface? Let's start our first session.
")), position: "bottom" }]); diff --git a/addons/portal/static/src/js/portal_chatter.js b/addons/portal/static/src/js/portal_chatter.js index 4aaa473ce90..962699bc003 100644 --- a/addons/portal/static/src/js/portal_chatter.js +++ b/addons/portal/static/src/js/portal_chatter.js @@ -6,6 +6,7 @@ const dom = require('web.dom'); var publicWidget = require('web.public.widget'); var time = require('web.time'); var portalComposer = require('portal.composer'); +const {Markup} = require('web.utils'); var qweb = core.qweb; var _t = core._t; @@ -118,13 +119,14 @@ var PortalChatter = publicWidget.Widget.extend({ /** * Update the messages format * - * @param {ArrayPublished on
