diff --git a/addons/account/static/src/js/account_portal_sidebar.js b/addons/account/static/src/js/account_portal_sidebar.js index 58114e00a56..44e9fc5336f 100644 --- a/addons/account/static/src/js/account_portal_sidebar.js +++ b/addons/account/static/src/js/account_portal_sidebar.js @@ -1,10 +1,9 @@ -odoo.define('account.AccountPortalSidebar', function (require) { -'use strict'; +/** @odoo-module **/ -const dom = require('web.dom'); -var publicWidget = require('web.public.widget'); -var PortalSidebar = require('portal.PortalSidebar'); -var utils = require('web.utils'); +import dom from "web.dom"; +import publicWidget from "web.public.widget"; +import PortalSidebar from "portal.PortalSidebar"; +import utils from "web.utils"; publicWidget.registry.AccountPortalSidebar = PortalSidebar.extend({ selector: '.o_portal_invoice_sidebar', @@ -70,4 +69,3 @@ publicWidget.registry.AccountPortalSidebar = PortalSidebar.extend({ this._printIframeContent(href); }, }); -}); diff --git a/addons/account/static/src/js/tours/account.js b/addons/account/static/src/js/tours/account.js index bdaf40b9423..719a55860c6 100644 --- a/addons/account/static/src/js/tours/account.js +++ b/addons/account/static/src/js/tours/account.js @@ -1,10 +1,9 @@ -odoo.define('account.tour', function(require) { -"use strict"; +/** @odoo-module alias=account.tour **/ -var core = require('web.core'); -const {Markup} = require('web.utils'); -const { registry } = require("@web/core/registry"); -const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +import core from "web.core"; +import {Markup} from "web.utils"; +import { registry } from "@web/core/registry"; +import { stepUtils } from "@web_tour/tour_service/tour_utils"; var _t = core._t; @@ -138,5 +137,3 @@ registry.category("web_tour.tours").add('account_tour', { run() {}, } ]}); - -}); diff --git a/addons/account/static/tests/tours/account_dashboard_setup_bar_tests.js b/addons/account/static/tests/tours/account_dashboard_setup_bar_tests.js index 9080a91714e..f3a99e9d0a5 100644 --- a/addons/account/static/tests/tours/account_dashboard_setup_bar_tests.js +++ b/addons/account/static/tests/tours/account_dashboard_setup_bar_tests.js @@ -1,9 +1,8 @@ -odoo.define('account.dashboard.setup.tour', function (require) { - "use strict"; - - var core = require('web.core'); - const { registry } = require("@web/core/registry"); - const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +/** @odoo-module alias=account.dashboard.setup.tour **/ + + import core from "web.core"; + import { registry } from "@web/core/registry"; + import { stepUtils } from "@web_tour/tour_service/tour_utils"; var _t = core._t; @@ -42,4 +41,3 @@ odoo.define('account.dashboard.setup.tour', function (require) { }, } ]}); -}); diff --git a/addons/account_payment/static/src/js/payment_form.js b/addons/account_payment/static/src/js/payment_form.js index 9fb04c83439..bffd3d95b3e 100644 --- a/addons/account_payment/static/src/js/payment_form.js +++ b/addons/account_payment/static/src/js/payment_form.js @@ -1,8 +1,7 @@ -odoo.define('account_payment.payment_form', require => { - 'use strict'; - - const checkoutForm = require('payment.checkout_form'); - const manageForm = require('payment.manage_form'); +/** @odoo-module **/ + + import checkoutForm from "payment.checkout_form"; + import manageForm from "payment.manage_form"; const PaymentMixin = { @@ -32,5 +31,3 @@ odoo.define('account_payment.payment_form', require => { checkoutForm.include(PaymentMixin); manageForm.include(PaymentMixin); - -}); diff --git a/addons/auth_signup/static/src/js/signup.js b/addons/auth_signup/static/src/js/signup.js index 366d4cef124..c408a8b4eed 100644 --- a/addons/auth_signup/static/src/js/signup.js +++ b/addons/auth_signup/static/src/js/signup.js @@ -1,7 +1,6 @@ -odoo.define('auth_signup.signup', function (require) { -'use strict'; +/** @odoo-module **/ -var publicWidget = require('web.public.widget'); +import publicWidget from "web.public.widget"; publicWidget.registry.SignUpForm = publicWidget.Widget.extend({ selector: '.oe_signup_form', @@ -22,4 +21,3 @@ publicWidget.registry.SignUpForm = publicWidget.Widget.extend({ $btn.prepend(' '); }, }); -}); diff --git a/addons/auth_totp/static/tests/totp_flow.js b/addons/auth_totp/static/tests/totp_flow.js index 53a35dee23e..6c0e91a9e6d 100644 --- a/addons/auth_totp/static/tests/totp_flow.js +++ b/addons/auth_totp/static/tests/totp_flow.js @@ -1,9 +1,8 @@ -odoo.define('auth_totp.tours', function(require) { -"use strict"; +/** @odoo-module **/ -const ajax = require('web.ajax'); -const { registry } = require("@web/core/registry"); -const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +import ajax from "web.ajax"; +import { registry } from "@web/core/registry"; +import { stepUtils } from "@web_tour/tour_service/tour_utils"; function openRoot() { return [{ @@ -337,4 +336,3 @@ registry.category("web_tour.tours").add('totp_admin_disables', { totp_state: false, }), ]}) -}); diff --git a/addons/auth_totp_mail/static/tests/totp_flow.js b/addons/auth_totp_mail/static/tests/totp_flow.js index b7115540760..7c9682db600 100644 --- a/addons/auth_totp_mail/static/tests/totp_flow.js +++ b/addons/auth_totp_mail/static/tests/totp_flow.js @@ -1,8 +1,7 @@ -odoo.define('auth_totp_mail.tours', function(require) { -"use strict"; +/** @odoo-module **/ -const { registry } = require("@web/core/registry"); -const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +import { registry } from "@web/core/registry"; +import { stepUtils } from "@web_tour/tour_service/tour_utils"; function openAccountSettingsTab() { return [{ @@ -73,5 +72,3 @@ registry.category("web_tour.tours").add('totp_admin_invite', { content: "check that demo user can be invited to use 2FA.", trigger: "button:contains(Invite to use 2FA)", }]}); - -}); \ No newline at end of file diff --git a/addons/auth_totp_portal/static/src/js/totp_frontend.js b/addons/auth_totp_portal/static/src/js/totp_frontend.js index c2dd9ad0d41..3449ac82d6c 100644 --- a/addons/auth_totp_portal/static/src/js/totp_frontend.js +++ b/addons/auth_totp_portal/static/src/js/totp_frontend.js @@ -1,10 +1,9 @@ -odoo.define('auth_totp_portal.button', function (require) { -'use strict'; +/** @odoo-module **/ -const {_t} = require('web.core'); -const publicWidget = require('web.public.widget'); -const Dialog = require('web.Dialog'); -const {handleCheckIdentity} = require('portal.portal'); +import {_t} from "web.core"; +import publicWidget from "web.public.widget"; +import Dialog from "web.Dialog"; +import {handleCheckIdentity} from "portal.portal"; /** * Replaces specific elements by normal HTML, strip out the rest entirely @@ -303,4 +302,3 @@ publicWidget.registry.RevokeAllTrustedDevicesButton = publicWidget.Widget.extend window.location = window.location; } }); -}); diff --git a/addons/auth_totp_portal/static/tests/totp_portal.js b/addons/auth_totp_portal/static/tests/totp_portal.js index d50d2678f95..f38c4da1155 100644 --- a/addons/auth_totp_portal/static/tests/totp_portal.js +++ b/addons/auth_totp_portal/static/tests/totp_portal.js @@ -1,8 +1,7 @@ -odoo.define('auth_totp_portal.tours', function(require) { -"use strict"; +/** @odoo-module **/ -const ajax = require('web.ajax'); -const { registry } = require("@web/core/registry"); +import ajax from "web.ajax"; +import { registry } from "@web/core/registry"; registry.category("web_tour.tours").add('totportal_tour_setup', { test: true, @@ -121,4 +120,3 @@ registry.category("web_tour.tours").add('totportal_login_disabled', { trigger: "h3:contains(Documents)", run: () => {} }]}); -}); diff --git a/addons/barcodes/static/src/js/barcode_parser.js b/addons/barcodes/static/src/js/barcode_parser.js index b7ce128a483..38410f3adcd 100644 --- a/addons/barcodes/static/src/js/barcode_parser.js +++ b/addons/barcodes/static/src/js/barcode_parser.js @@ -1,8 +1,7 @@ -odoo.define('barcodes.BarcodeParser', function (require) { -"use strict"; +/** @odoo-module alias=barcodes.BarcodeParser **/ -var Class = require('web.Class'); -var rpc = require('web.rpc'); +import Class from "web.Class"; +import rpc from "web.rpc"; // The BarcodeParser is used to detect what is the category // of a barcode (product, partner, ...) and extract an encoded value @@ -277,5 +276,4 @@ var BarcodeParser = Class.extend({ }, }); -return BarcodeParser; -}); +export default BarcodeParser; diff --git a/addons/barcodes/static/tests/basic/legacy/barcode_parser_tests.js b/addons/barcodes/static/tests/basic/legacy/barcode_parser_tests.js index 4ce5f807261..48cdad00dcf 100644 --- a/addons/barcodes/static/tests/basic/legacy/barcode_parser_tests.js +++ b/addons/barcodes/static/tests/basic/legacy/barcode_parser_tests.js @@ -1,7 +1,6 @@ -odoo.define('barcodes/static/tests/barcode_parser_tests.js', function (require) { -"use strict"; +/** @odoo-module **/ -const BarcodeParser = require('barcodes.BarcodeParser'); +import BarcodeParser from "barcodes.BarcodeParser"; QUnit.module('Barcodes', {}, function () { @@ -55,4 +54,3 @@ QUnit.module('Barcode Parser', { }); }); }); -}); diff --git a/addons/barcodes/static/tests/mobile/barcode_mobile_tests.js b/addons/barcodes/static/tests/mobile/barcode_mobile_tests.js index b2a27ceb94c..7517d5dbf1b 100644 --- a/addons/barcodes/static/tests/mobile/barcode_mobile_tests.js +++ b/addons/barcodes/static/tests/mobile/barcode_mobile_tests.js @@ -1,11 +1,10 @@ -odoo.define('barcodes.barcode_mobile_tests', function (require) { - "use strict"; - - const {barcodeService} = require("@barcodes/barcode_service"); - const {barcodeRemapperService} = require("@barcodes/js/barcode_events"); - const { makeTestEnv } = require("@web/../tests/helpers/mock_env"); - const { registry } = require("@web/core/registry"); - var testUtils = require('web.test_utils'); +/** @odoo-module **/ + + import {barcodeService} from "@barcodes/barcode_service"; + import {barcodeRemapperService} from "@barcodes/js/barcode_events"; + import { makeTestEnv } from "@web/../tests/helpers/mock_env"; + import { registry } from "@web/core/registry"; + import testUtils from "web.test_utils"; const maxTimeBetweenKeysInMs = barcodeService.maxTimeBetweenKeysInMs; const isMobileChrome = barcodeService.isMobileChrome; @@ -102,4 +101,3 @@ odoo.define('barcodes.barcode_mobile_tests', function (require) { document.querySelector('input[name=barcode]').remove(); }); }); - }); diff --git a/addons/barcodes_gs1_nomenclature/static/src/js/barcode_parser.js b/addons/barcodes_gs1_nomenclature/static/src/js/barcode_parser.js index f7bbf51fb46..3561d1fd80b 100644 --- a/addons/barcodes_gs1_nomenclature/static/src/js/barcode_parser.js +++ b/addons/barcodes_gs1_nomenclature/static/src/js/barcode_parser.js @@ -1,9 +1,8 @@ -odoo.define('barcodes_gs1_nomenclature/static/src/js/barcode_parser.js', function (require) { -"use strict"; +/** @odoo-module alias=barcodes_gs1_nomenclature.barcode_parser **/ -const BarcodeParser = require('barcodes.BarcodeParser'); +import BarcodeParser from "barcodes.BarcodeParser"; const FNC1_CHAR = String.fromCharCode(29); -const {_lt} = require('web.core'); +import {_lt} from "web.core"; BarcodeParser.include({ /** @@ -148,8 +147,7 @@ BarcodeParser.include({ }, }); -return { +export default { BarcodeParser, FNC1_CHAR, }; -}); diff --git a/addons/barcodes_gs1_nomenclature/static/src/js/barcode_service.js b/addons/barcodes_gs1_nomenclature/static/src/js/barcode_service.js index d37a4adb811..e74bff971ea 100644 --- a/addons/barcodes_gs1_nomenclature/static/src/js/barcode_service.js +++ b/addons/barcodes_gs1_nomenclature/static/src/js/barcode_service.js @@ -4,7 +4,7 @@ import { session } from "@web/session"; import { patch } from "@web/core/utils/patch"; import { barcodeService } from '@barcodes/barcode_service'; -import { FNC1_CHAR } from "barcodes_gs1_nomenclature/static/src/js/barcode_parser.js"; +import { FNC1_CHAR } from "barcodes_gs1_nomenclature.barcode_parser"; patch(barcodeService, 'barcodes_gs1_nomenclature', { diff --git a/addons/barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js b/addons/barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js index 01741e6554d..560bf099df9 100644 --- a/addons/barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js +++ b/addons/barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js @@ -1,8 +1,7 @@ -odoo.define('barcodes_gs1_nomenclature/static/src/js/tests/barcode_parser_tests.js', function (require) { -"use strict"; +/** @odoo-module **/ -const BarcodeParser = require('barcodes.BarcodeParser'); -const { barcodeService } = require('@barcodes/barcode_service'); +import BarcodeParser from "barcodes.BarcodeParser"; +import { barcodeService } from "@barcodes/barcode_service"; QUnit.module('Barcodes', {}, function () { @@ -249,5 +248,3 @@ QUnit.module('Barcode GS1 Parser', { }); }); }); - -}); diff --git a/addons/board/static/src/add_to_board/legacy_add_to_board.js b/addons/board/static/src/add_to_board/legacy_add_to_board.js index 01f4dee4abd..cda6329dbaf 100644 --- a/addons/board/static/src/add_to_board/legacy_add_to_board.js +++ b/addons/board/static/src/add_to_board/legacy_add_to_board.js @@ -1,12 +1,11 @@ -odoo.define("board.AddToBoardMenu", function (require) { - "use strict"; +/** @odoo-module alias=board.AddToBoardMenu **/ - const Context = require("web.Context"); - const Domain = require("web.Domain"); - const { Dropdown } = require("@web/core/dropdown/dropdown"); - const FavoriteMenu = require("web.FavoriteMenu"); - const { sprintf } = require("web.utils"); - const { useAutofocus } = require("@web/core/utils/hooks"); + import Context from "web.Context"; + import Domain from "web.Domain"; + import { Dropdown } from "@web/core/dropdown/dropdown"; + import FavoriteMenu from "web.FavoriteMenu"; + import { sprintf } from "web.utils"; + import { useAutofocus } from "@web/core/utils/hooks"; const { Component, useState } = owl; @@ -156,5 +155,4 @@ odoo.define("board.AddToBoardMenu", function (require) { FavoriteMenu.registry.add("add-to-board-menu", AddToBoardMenu, 10); - return AddToBoardMenu; -}); + export default AddToBoardMenu; diff --git a/addons/bus/static/tests/bus_tests.js b/addons/bus/static/tests/bus_tests.js index 2691dce2aa0..98e909ea4d6 100644 --- a/addons/bus/static/tests/bus_tests.js +++ b/addons/bus/static/tests/bus_tests.js @@ -1,19 +1,18 @@ -odoo.define('web.bus_tests', function (require) { -"use strict"; +/** @odoo-module **/ -var { busService } = require('@bus/services/bus_service'); -const { presenceService } = require('@bus/services/presence_service'); -const { busParametersService } = require('@bus/bus_parameters_service'); -const { multiTabService } = require('@bus/multi_tab_service'); -const { WEBSOCKET_CLOSE_CODES } = require("@bus/workers/websocket_worker"); -const { startServer } = require('@bus/../tests/helpers/mock_python_environment'); -const { patchWebsocketWorkerWithCleanup } = require("@bus/../tests/helpers/mock_websocket"); +import { busService } from "@bus/services/bus_service"; +import { presenceService } from "@bus/services/presence_service"; +import { busParametersService } from "@bus/bus_parameters_service"; +import { multiTabService } from "@bus/multi_tab_service"; +import { WEBSOCKET_CLOSE_CODES } from "@bus/workers/websocket_worker"; +import { startServer } from "@bus/../tests/helpers/mock_python_environment"; +import { patchWebsocketWorkerWithCleanup } from "@bus/../tests/helpers/mock_websocket"; -const { browser } = require("@web/core/browser/browser"); -const { registry } = require("@web/core/registry"); -const { session } = require('@web/session'); -const { makeDeferred, nextTick, patchWithCleanup } = require("@web/../tests/helpers/utils"); -const { makeTestEnv } = require('@web/../tests/helpers/mock_env'); +import { browser } from "@web/core/browser/browser"; +import { registry } from "@web/core/registry"; +import { session } from "@web/session"; +import { makeDeferred, nextTick, patchWithCleanup } from "@web/../tests/helpers/utils"; +import { makeTestEnv } from "@web/../tests/helpers/mock_env"; QUnit.module('Bus', { beforeEach: function () { @@ -583,5 +582,3 @@ QUnit.module('Bus', { } ); }); -}); - diff --git a/addons/calendar/static/tests/tours/calendar_tour.js b/addons/calendar/static/tests/tours/calendar_tour.js index 5ef1f95c651..0fded337c8c 100644 --- a/addons/calendar/static/tests/tours/calendar_tour.js +++ b/addons/calendar/static/tests/tours/calendar_tour.js @@ -1,7 +1,7 @@ -odoo.define('calendar.tour', function (require) { - 'use strict'; - const { registry } = require("@web/core/registry"); - const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +/** @odoo-module **/ + + import { registry } from "@web/core/registry"; + import { stepUtils } from "@web_tour/tour_service/tour_utils"; const todayDate = function() { let now = new Date(); @@ -69,4 +69,3 @@ odoo.define('calendar.tour', function (require) { content: 'Check the event title', }, ]}); -}); diff --git a/addons/contacts/static/tests/tours/debug_menu_set_defaults.js b/addons/contacts/static/tests/tours/debug_menu_set_defaults.js index fb1941051b9..255ce474136 100644 --- a/addons/contacts/static/tests/tours/debug_menu_set_defaults.js +++ b/addons/contacts/static/tests/tours/debug_menu_set_defaults.js @@ -1,8 +1,7 @@ -odoo.define('debug_menu_set_defaults.tour', function (require) { - "use strict"; - - const { registry } = require("@web/core/registry"); - const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +/** @odoo-module **/ + + import { registry } from "@web/core/registry"; + import { stepUtils } from "@web_tour/tour_service/tour_utils"; registry.category("web_tour.tours").add('debug_menu_set_defaults', { test: true, @@ -70,5 +69,3 @@ odoo.define('debug_menu_set_defaults.tour', function (require) { }, ] }); - -}); diff --git a/addons/crm/static/tests/tours/crm_email_and_phone_propagation.js b/addons/crm/static/tests/tours/crm_email_and_phone_propagation.js index 3e4ac45cecc..eabc25f43f5 100644 --- a/addons/crm/static/tests/tours/crm_email_and_phone_propagation.js +++ b/addons/crm/static/tests/tours/crm_email_and_phone_propagation.js @@ -1,8 +1,7 @@ -odoo.define('crm.crm_email_and_phone_propagation', function (require) { - 'use strict'; - - const { registry } = require("@web/core/registry"); - const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +/** @odoo-module **/ + + import { registry } from "@web/core/registry"; + import { stepUtils } from "@web_tour/tour_service/tour_utils"; registry.category("web_tour.tours").add('crm_email_and_phone_propagation_edit_save', { test: true, @@ -54,4 +53,3 @@ odoo.define('crm.crm_email_and_phone_propagation', function (require) { trigger: '.o_kanban_renderer', } ]}); -}); diff --git a/addons/crm_iap_mine/static/src/js/tours/crm_iap_lead.js b/addons/crm_iap_mine/static/src/js/tours/crm_iap_lead.js index a08caf48268..36b9c45a062 100644 --- a/addons/crm_iap_mine/static/src/js/tours/crm_iap_lead.js +++ b/addons/crm_iap_mine/static/src/js/tours/crm_iap_lead.js @@ -1,11 +1,10 @@ -odoo.define('crm_iap_mine.generate_leads_steps', function (require) { -"use strict"; +/** @odoo-module **/ -const { registry } = require("@web/core/registry"); -const {Markup} = require('web.utils'); -var core = require('web.core'); +import { registry } from "@web/core/registry"; +import {Markup} from "web.utils"; +import core from "web.core"; -require('@crm/js/tours/crm'); +import "@crm/js/tours/crm"; var _t = core._t; var DragOppToWonStepIndex = _.findIndex(registry.category("web_tour.tours").get("crm_tour").steps, function (step) { @@ -38,5 +37,3 @@ registry.category("web_tour.tours").get("crm_tour").steps.splice(DragOppToWonSte actions.auto('.modal-footer button[special=cancel]'); } }); - -}); diff --git a/addons/event/static/src/js/tours/event_steps.js b/addons/event/static/src/js/tours/event_steps.js new file mode 100644 index 00000000000..ae2ed0dbf6a --- /dev/null +++ b/addons/event/static/src/js/tours/event_steps.js @@ -0,0 +1,13 @@ +/** @odoo-module alias=event.event_steps **/ + +import core from "web.core"; + +var EventAdditionalTourSteps = core.Class.extend({ + + _get_website_event_steps: function () { + return [false]; + }, + +}); + +export default EventAdditionalTourSteps; diff --git a/addons/event/static/src/js/tours/event_tour.js b/addons/event/static/src/js/tours/event_tour.js index 8ad2e099666..e6663e4e590 100644 --- a/addons/event/static/src/js/tours/event_tour.js +++ b/addons/event/static/src/js/tours/event_tour.js @@ -1,29 +1,11 @@ -odoo.define('event.event_steps', function (require) { -"use strict"; +/** @odoo-module **/ -var core = require('web.core'); +import {_t} from "web.core"; +import {Markup} from "web.utils"; +import { registry } from "@web/core/registry"; +import { stepUtils } from "@web_tour/tour_service/tour_utils"; -var EventAdditionalTourSteps = core.Class.extend({ - - _get_website_event_steps: function () { - return [false]; - }, - -}); - -return EventAdditionalTourSteps; - -}); - -odoo.define('event.event_tour', function (require) { -"use strict"; - -const {_t} = require('web.core'); -const {Markup} = require('web.utils'); -const { registry } = require("@web/core/registry"); -const { stepUtils } = require('@web_tour/tour_service/tour_utils'); - -var EventAdditionalTourSteps = require('event.event_steps'); +import EventAdditionalTourSteps from "event.event_steps"; registry.category("web_tour.tours").add('event_tour', { url: '/web', @@ -75,5 +57,3 @@ registry.category("web_tour.tours").add('event_tour', { position: 'bottom', run: 'click', }].filter(Boolean)}); - -}); diff --git a/addons/event_sale/static/tests/tours/event_configurator_ui.js b/addons/event_sale/static/tests/tours/event_configurator_ui.js index adf76df0553..07380d8c774 100644 --- a/addons/event_sale/static/tests/tours/event_configurator_ui.js +++ b/addons/event_sale/static/tests/tours/event_configurator_ui.js @@ -1,8 +1,7 @@ -odoo.define('event.event_configurator_tour', function (require) { -"use strict"; +/** @odoo-module **/ -const { registry } = require("@web/core/registry"); -const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +import { registry } from "@web/core/registry"; +import { stepUtils } from "@web_tour/tour_service/tour_utils"; registry.category("web_tour.tours").add('event_configurator_tour', { url: "/web", @@ -74,5 +73,3 @@ registry.category("web_tour.tours").add('event_configurator_tour', { run: function () {} // check }, ...stepUtils.saveForm() ]}); - -}); diff --git a/addons/google_recaptcha/static/src/js/recaptcha.js b/addons/google_recaptcha/static/src/js/recaptcha.js index c71673eabf1..7d5153215c5 100644 --- a/addons/google_recaptcha/static/src/js/recaptcha.js +++ b/addons/google_recaptcha/static/src/js/recaptcha.js @@ -1,10 +1,9 @@ -odoo.define('google_recaptcha.ReCaptchaV3', function (require) { -"use strict"; +/** @odoo-module alias=google_recaptcha.ReCaptchaV3 **/ -const Class = require('web.Class'); -const core = require('web.core'); -const { session } = require('@web/session'); -const { loadJS } = require('@web/core/assets'); +import Class from "web.Class"; +import core from "web.core"; +import { session } from "@web/session"; +import { loadJS } from "@web/core/assets"; const _t = core._t; @@ -55,7 +54,6 @@ const ReCaptcha = Class.extend({ }, }); -return { +export default { ReCaptcha: ReCaptcha, }; -}); diff --git a/addons/hr_expense/static/src/js/tours/hr_expense.js b/addons/hr_expense/static/src/js/tours/hr_expense.js index 353d1151a68..70a7b8e3cf2 100644 --- a/addons/hr_expense/static/src/js/tours/hr_expense.js +++ b/addons/hr_expense/static/src/js/tours/hr_expense.js @@ -1,11 +1,10 @@ -odoo.define('hr_expense.tour', function(require) { -"use strict"; +/** @odoo-module **/ -const {_t} = require('web.core'); -const {Markup} = require('web.utils'); +import {_t} from "web.core"; +import {Markup} from "web.utils"; -const { registry } = require("@web/core/registry"); -const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +import { registry } from "@web/core/registry"; +import { stepUtils } from "@web_tour/tour_service/tour_utils"; registry.category("web_tour.tours").add('hr_expense_tour' , { url: "/web", @@ -80,5 +79,3 @@ stepUtils.openBurgerMenu(), }, ...stepUtils.statusbarButtonsSteps(_t("Approve"), _t("Managers can approve the report here, then an accountant can post the accounting entries.")), ]}); - -}); diff --git a/addons/hr_expense/static/tests/tours/expense_upload_tours.js b/addons/hr_expense/static/tests/tours/expense_upload_tours.js index c848e1c632c..bd8691291f1 100644 --- a/addons/hr_expense/static/tests/tours/expense_upload_tours.js +++ b/addons/hr_expense/static/tests/tours/expense_upload_tours.js @@ -1,8 +1,7 @@ -odoo.define('hr_expense.tests.tours', function (require) { - "use strict"; - - const { registry } = require("@web/core/registry"); - const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +/** @odoo-module **/ + + import { registry } from "@web/core/registry"; + import { stepUtils } from "@web_tour/tour_service/tour_utils"; registry.category("web_tour.tours").add('hr_expense_test_tour', { test: true, @@ -77,4 +76,3 @@ odoo.define('hr_expense.tests.tours', function (require) { } }, ]}); -}); diff --git a/addons/hr_holidays/static/tests/tours/time_off_request_calendar_view.js b/addons/hr_holidays/static/tests/tours/time_off_request_calendar_view.js index 58381869f92..38678742086 100644 --- a/addons/hr_holidays/static/tests/tours/time_off_request_calendar_view.js +++ b/addons/hr_holidays/static/tests/tours/time_off_request_calendar_view.js @@ -1,8 +1,7 @@ -odoo.define('hr_holidays.tour_time_off_request_calendar_view', function (require) { -'use strict'; +/** @odoo-module **/ -const { registry } = require("@web/core/registry"); -const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +import { registry } from "@web/core/registry"; +import { stepUtils } from "@web_tour/tour_service/tour_utils"; registry.category("web_tour.tours").add('time_off_request_calendar_view', { test: true, @@ -41,4 +40,3 @@ registry.category("web_tour.tours").add('time_off_request_calendar_view', { run: 'click', } ]}); -}); 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 b678935fad8..4cb28b57c5d 100644 --- a/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js +++ b/addons/hr_recruitment/static/src/js/tours/hr_recruitment.js @@ -1,10 +1,9 @@ -odoo.define('hr_recruitment.tour', function(require) { -"use strict"; +/** @odoo-module **/ -const {_t} = require('web.core'); -const {Markup} = require('web.utils'); -const { registry } = require("@web/core/registry"); -const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +import {_t} from "web.core"; +import {Markup} from "web.utils"; +import { registry } from "@web/core/registry"; +import { stepUtils } from "@web_tour/tour_service/tour_utils"; const { markup } = owl; @@ -106,5 +105,3 @@ registry.category("web_tour.tours").add('hr_recruitment_tour',{ position: "bottom", width: 80 }]}); - -}); diff --git a/addons/im_livechat/static/src/public/session.js b/addons/im_livechat/static/src/public/session.js index 7853ba0eeae..a3971c7bc49 100644 --- a/addons/im_livechat/static/src/public/session.js +++ b/addons/im_livechat/static/src/public/session.js @@ -1,6 +1,6 @@ -odoo.define("web.session", function (require) { - const Session = require("web.Session"); - const { serverUrl } = require("@im_livechat/livechat_data"); +/** @odoo-module alias=web.session **/ - return new Session(undefined, serverUrl, { use_cors: true }); -}); +import Session from "web.Session"; +import { serverUrl } from "@im_livechat/livechat_data"; + +export default new Session(undefined, serverUrl, { use_cors: true }); diff --git a/addons/l10n_ar/static/src/js/tours/account.js b/addons/l10n_ar/static/src/js/tours/account.js index 3267bd65012..77a915da3c8 100644 --- a/addons/l10n_ar/static/src/js/tours/account.js +++ b/addons/l10n_ar/static/src/js/tours/account.js @@ -1,8 +1,7 @@ -odoo.define('l10n_ar.account_tour', function(require) { -"use strict"; +/** @odoo-module **/ - require("account.tour"); - const { registry } = require("@web/core/registry"); + import "account.tour"; + import { registry } from "@web/core/registry"; let account_tour = registry.category("web_tour.tours").get("account_tour"); // Remove the step suggesting to change the name as it is done another way (document number) account_tour.steps = _.filter(account_tour.steps, step => step.trigger != "input[name=name]"); @@ -22,5 +21,3 @@ odoo.define('l10n_ar.account_tour', function(require) { auto: true, in_modal: false, }) - -}) diff --git a/addons/mail/static/src/public/root_widget.js b/addons/mail/static/src/public/root_widget.js index 9dd93aa236f..e2ad45840d1 100644 --- a/addons/mail/static/src/public/root_widget.js +++ b/addons/mail/static/src/public/root_widget.js @@ -1,12 +1,12 @@ +/** @odoo-module alias=root.widget **/ /** * This module exists so that web_tour can use it as the parent of the * TourManager so it can get access to _trigger_up. */ -odoo.define("root.widget", function (require) { - // need to wait for owl.Component.env to be set by new/public/boot before - // we spawn the component adapter - require("@mail/public/boot"); - const { standaloneAdapter } = require("web.OwlCompatibility"); - const { Component } = require("@odoo/owl"); - return standaloneAdapter({ Component }); -}); +// need to wait for owl.Component.env to be set by new/public/boot before +// we spawn the component adapter +import "@mail/public/boot"; +import { standaloneAdapter } from "web.OwlCompatibility"; +import { Component } from "@odoo/owl"; + +export default standaloneAdapter({ Component }); diff --git a/addons/mail_group/static/src/js/mail_group.js b/addons/mail_group/static/src/js/mail_group.js index fce6175cc6d..c04480f4f7f 100644 --- a/addons/mail_group/static/src/js/mail_group.js +++ b/addons/mail_group/static/src/js/mail_group.js @@ -1,8 +1,7 @@ -odoo.define('mail_group.mail_group', function (require) { -'use strict'; +/** @odoo-module alias=mail_group.mail_group **/ -const publicWidget = require('web.public.widget'); -const core = require('web.core'); +import publicWidget from "web.public.widget"; +import core from "web.core"; const _t = core._t; publicWidget.registry.MailGroup = publicWidget.Widget.extend({ @@ -88,5 +87,4 @@ publicWidget.registry.MailGroup = publicWidget.Widget.extend({ }, }); -return publicWidget.registry.MailGroup; -}); +export default publicWidget.registry.MailGroup; diff --git a/addons/mail_group/static/src/js/mail_group_message.js b/addons/mail_group/static/src/js/mail_group_message.js index 47d2e90df4e..f510099f42f 100644 --- a/addons/mail_group/static/src/js/mail_group_message.js +++ b/addons/mail_group/static/src/js/mail_group_message.js @@ -1,7 +1,6 @@ -odoo.define('mail_group.mail_group_message', function (require) { -'use strict'; +/** @odoo-module **/ -const publicWidget = require('web.public.widget'); +import publicWidget from "web.public.widget"; publicWidget.registry.MailGroupMessage = publicWidget.Widget.extend({ selector: '.o_mg_message', @@ -86,4 +85,3 @@ publicWidget.registry.MailGroupMessage = publicWidget.Widget.extend({ }); }, }); -}); diff --git a/addons/mass_mailing/static/src/js/mailing_portal.js b/addons/mass_mailing/static/src/js/mailing_portal.js index a0c81af4498..0a848e871ef 100644 --- a/addons/mass_mailing/static/src/js/mailing_portal.js +++ b/addons/mass_mailing/static/src/js/mailing_portal.js @@ -1,10 +1,9 @@ -odoo.define('mass_mailing.unsubscribe', function (require) { - 'use strict'; +/** @odoo-module **/ - var session = require('web.session'); - var ajax = require('web.ajax'); - var core = require('web.core'); - require('web.dom_ready'); + import session from "web.session"; + import ajax from "web.ajax"; + import core from "web.core"; + import "web.dom_ready"; var _t = core._t; @@ -13,9 +12,7 @@ odoo.define('mass_mailing.unsubscribe', function (require) { var res_id = parseInt($("input[name='res_id']").val()); var token = (location.search.split('token' + '=')[1] || '').split('&')[0]; - if (!$('.o_unsubscribe_form').length) { - return; - } +if ($('.o_unsubscribe_form').length) { session.load_translations().then(function () { if (email != '' && email != undefined){ ajax.jsonRpc('/mailing/blacklist/check', 'call', {'email': email, 'mailing_id': mailing_id, 'res_id': res_id, 'token': token}) @@ -63,12 +60,12 @@ odoo.define('mass_mailing.unsubscribe', function (require) { var checked_ids = []; $("input[type='checkbox']:checked").each(function (i){ - checked_ids[i] = parseInt($(this).val()); + checked_ids[i] = parseInt($(this).val()); }); var unchecked_ids = []; $("input[type='checkbox']:not(:checked)").each(function (i){ - unchecked_ids[i] = parseInt($(this).val()); + unchecked_ids[i] = parseInt($(this).val()); }); ajax.jsonRpc('/mailing/list/update', 'call', {'opt_in_ids': checked_ids, 'opt_out_ids': unchecked_ids, 'email': email, 'mailing_id': mailing_id, 'res_id': res_id, 'token': token}) @@ -186,7 +183,6 @@ odoo.define('mass_mailing.unsubscribe', function (require) { $('#info_state').removeClass('alert-info').removeClass('alert-success').removeClass('alert-error').addClass('alert-warning'); }); }); -}); function toggle_opt_out_section(value) { var result = !value; @@ -196,3 +192,4 @@ function toggle_opt_out_section(value) { if (value) { $('[name="button_subscription"]').addClass('clickable'); } else { $('[name="button_subscription"]').removeClass('clickable'); } } +} diff --git a/addons/mass_mailing/static/src/js/mass_mailing_link_dialog_fix.js b/addons/mass_mailing/static/src/js/mass_mailing_link_dialog_fix.js index e580b3e41ce..c31c00bff59 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_link_dialog_fix.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_link_dialog_fix.js @@ -1,4 +1,3 @@ - odoo.define('mass_mailing.fix.LinkDialog', function (require) { 'use strict'; @@ -71,5 +70,4 @@ LinkDialog.include({ } }, }); - }); diff --git a/addons/mass_mailing/static/src/js/mass_mailing_snippets.js b/addons/mass_mailing/static/src/js/mass_mailing_snippets.js index 22a216a1830..534b0423c8c 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing_snippets.js +++ b/addons/mass_mailing/static/src/js/mass_mailing_snippets.js @@ -306,5 +306,4 @@ options.registry.DesignTab = options.Class.extend({ return [...(this.styleSheet.cssRules || this.styleSheet.rules)].find(rule => rule.selectorText === selectorText); }, }); - }); diff --git a/addons/mass_mailing/static/src/js/snippets.editor.js b/addons/mass_mailing/static/src/js/snippets.editor.js index 20ef9a44584..13ed75c22fe 100644 --- a/addons/mass_mailing/static/src/js/snippets.editor.js +++ b/addons/mass_mailing/static/src/js/snippets.editor.js @@ -1,8 +1,7 @@ -odoo.define('mass_mailing.snippets.editor', function (require) { -'use strict'; +/** @odoo-module alias=mass_mailing.snippets.editor **/ -const {_lt} = require('web.core'); -const snippetsEditor = require('web_editor.snippet.editor'); +import {_lt} from "web.core"; +import snippetsEditor from "web_editor.snippet.editor"; const MassMailingSnippetsMenu = snippetsEditor.SnippetsMenu.extend({ events: _.extend({}, snippetsEditor.SnippetsMenu.prototype.events, { @@ -163,6 +162,4 @@ const MassMailingSnippetsMenu = snippetsEditor.SnippetsMenu.extend({ }, }); -return MassMailingSnippetsMenu; - -}); +export default MassMailingSnippetsMenu; diff --git a/addons/mass_mailing/static/src/js/tours/mass_mailing_editor_tour.js b/addons/mass_mailing/static/src/js/tours/mass_mailing_editor_tour.js index fa0700fbce2..8438309458d 100644 --- a/addons/mass_mailing/static/src/js/tours/mass_mailing_editor_tour.js +++ b/addons/mass_mailing/static/src/js/tours/mass_mailing_editor_tour.js @@ -1,8 +1,7 @@ -odoo.define('mass_mailing.mass_mailing_editor_tour', function (require) { - "use strict"; - - const { registry } = require("@web/core/registry"); - const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +/** @odoo-module **/ + + import { registry } from "@web/core/registry"; + import { stepUtils } from "@web_tour/tour_service/tour_utils"; registry.category("web_tour.tours").add('mass_mailing_editor_tour', { url: '/web', @@ -57,4 +56,3 @@ odoo.define('mass_mailing.mass_mailing_editor_tour', function (require) { trigger: 'iframe .o_editable', run: () => {}, }]}); -}); 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 ef972a53646..c47c9eb4847 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,10 +1,9 @@ -odoo.define('mass_mailing.mass_mailing_tour', function (require) { - "use strict"; - - const { registry } = require("@web/core/registry"); - const { stepUtils } = require('@web_tour/tour_service/tour_utils'); - const {_t} = require('web.core'); - const {Markup} = require('web.utils'); +/** @odoo-module **/ + + import { registry } from "@web/core/registry"; + import { stepUtils } from "@web_tour/tour_service/tour_utils"; + import {_t} from "web.core"; + import {Markup} from "web.utils"; var now = moment(); registry.category("web_tour.tours").add('mass_mailing_tour', { @@ -92,4 +91,3 @@ odoo.define('mass_mailing.mass_mailing_tour', function (require) { run: 'click', }] }); -}); diff --git a/addons/mass_mailing/static/src/js/wysiwyg.js b/addons/mass_mailing/static/src/js/wysiwyg.js index e8741c62ee4..d95542583a1 100644 --- a/addons/mass_mailing/static/src/js/wysiwyg.js +++ b/addons/mass_mailing/static/src/js/wysiwyg.js @@ -1,9 +1,8 @@ -odoo.define('mass_mailing.wysiwyg', function (require) { -'use strict'; +/** @odoo-module alias=mass_mailing.wysiwyg **/ -var Wysiwyg = require('web_editor.wysiwyg'); -var MassMailingSnippetsMenu = require('mass_mailing.snippets.editor'); -const {closestElement} = require('@web_editor/js/editor/odoo-editor/src/OdooEditor'); +import Wysiwyg from "web_editor.wysiwyg"; +import MassMailingSnippetsMenu from "mass_mailing.snippets.editor"; +import {closestElement} from "@web_editor/js/editor/odoo-editor/src/OdooEditor"; const MassMailingWysiwyg = Wysiwyg.extend({ //-------------------------------------------------------------------------- @@ -80,6 +79,4 @@ const MassMailingWysiwyg = Wysiwyg.extend({ }, }); -return MassMailingWysiwyg; - -}); +export default MassMailingWysiwyg; diff --git a/addons/payment/static/src/js/checkout_form.js b/addons/payment/static/src/js/checkout_form.js index c6d4b03e02a..a078e628b7e 100644 --- a/addons/payment/static/src/js/checkout_form.js +++ b/addons/payment/static/src/js/checkout_form.js @@ -1,9 +1,8 @@ -odoo.define('payment.checkout_form', require => { - 'use strict'; +/** @odoo-module alias=payment.checkout_form **/ + + import publicWidget from "web.public.widget"; - const publicWidget = require('web.public.widget'); - - const paymentFormMixin = require('payment.payment_form_mixin'); + import paymentFormMixin from "payment.payment_form_mixin"; publicWidget.registry.PaymentCheckoutForm = publicWidget.Widget.extend(paymentFormMixin, { selector: 'form[name="o_payment_checkout"]', @@ -98,5 +97,4 @@ odoo.define('payment.checkout_form', require => { }, }); - return publicWidget.registry.PaymentCheckoutForm; -}); + export default publicWidget.registry.PaymentCheckoutForm; diff --git a/addons/payment/static/src/js/manage_form.js b/addons/payment/static/src/js/manage_form.js index 8cdb1a9e75c..0eb04900d6d 100644 --- a/addons/payment/static/src/js/manage_form.js +++ b/addons/payment/static/src/js/manage_form.js @@ -1,11 +1,10 @@ -odoo.define('payment.manage_form', require => { - 'use strict'; +/** @odoo-module alias=payment.manage_form **/ + + import core from "web.core"; + import publicWidget from "web.public.widget"; + import Dialog from "web.Dialog"; - const core = require('web.core'); - const publicWidget = require('web.public.widget'); - const Dialog = require('web.Dialog'); - - const paymentFormMixin = require('payment.payment_form_mixin'); + import paymentFormMixin from "payment.payment_form_mixin"; const _t = core._t; @@ -249,5 +248,4 @@ odoo.define('payment.manage_form', require => { }, }); - return publicWidget.registry.PaymentManageForm; -}); + export default publicWidget.registry.PaymentManageForm; diff --git a/addons/payment/static/src/js/post_processing.js b/addons/payment/static/src/js/post_processing.js index 31adf4c2b78..4832227a360 100644 --- a/addons/payment/static/src/js/post_processing.js +++ b/addons/payment/static/src/js/post_processing.js @@ -1,9 +1,8 @@ -odoo.define('payment.post_processing', function (require) { - 'use strict'; - - var publicWidget = require('web.public.widget'); - var core = require('web.core'); - const {Markup} = require('web.utils'); +/** @odoo-module alias=payment.post_processing **/ + + import publicWidget from "web.public.widget"; + import core from "web.core"; + import {Markup} from "web.utils"; var _t = core._t; @@ -138,5 +137,4 @@ odoo.define('payment.post_processing', function (require) { }, }); - return publicWidget.registry.PaymentPostProcessing; -}); + export default publicWidget.registry.PaymentPostProcessing; diff --git a/addons/payment_adyen/static/src/js/payment_form.js b/addons/payment_adyen/static/src/js/payment_form.js index edbecc1032a..fe6df2f2d98 100644 --- a/addons/payment_adyen/static/src/js/payment_form.js +++ b/addons/payment_adyen/static/src/js/payment_form.js @@ -1,10 +1,9 @@ +/** @odoo-module **/ /* global AdyenCheckout */ -odoo.define('payment_adyen.payment_form', require => { - 'use strict'; - - const core = require('web.core'); - const checkoutForm = require('payment.checkout_form'); - const manageForm = require('payment.manage_form'); + + import core from "web.core"; + import checkoutForm from "payment.checkout_form"; + import manageForm from "payment.manage_form"; const _t = core._t; @@ -214,4 +213,3 @@ odoo.define('payment_adyen.payment_form', require => { checkoutForm.include(adyenMixin); manageForm.include(adyenMixin); -}); diff --git a/addons/payment_authorize/static/src/js/payment_form.js b/addons/payment_authorize/static/src/js/payment_form.js index e1a23d80d71..9998e980e1b 100644 --- a/addons/payment_authorize/static/src/js/payment_form.js +++ b/addons/payment_authorize/static/src/js/payment_form.js @@ -1,12 +1,11 @@ +/** @odoo-module **/ /* global Accept */ -odoo.define('payment_authorize.payment_form', require => { - 'use strict'; + + import core from "web.core"; + import { loadJS } from "@web/core/assets"; - const core = require('web.core'); - const { loadJS } = require('@web/core/assets'); - - const checkoutForm = require('payment.checkout_form'); - const manageForm = require('payment.manage_form'); + import checkoutForm from "payment.checkout_form"; + import manageForm from "payment.manage_form"; const _t = core._t; @@ -210,4 +209,3 @@ odoo.define('payment_authorize.payment_form', require => { checkoutForm.include(authorizeMixin); manageForm.include(authorizeMixin); -}); diff --git a/addons/payment_custom/static/src/js/post_processing.js b/addons/payment_custom/static/src/js/post_processing.js index 592a426538f..b95d9af1a13 100644 --- a/addons/payment_custom/static/src/js/post_processing.js +++ b/addons/payment_custom/static/src/js/post_processing.js @@ -1,7 +1,6 @@ -odoo.define('payment_custom.post_processing', require => { - 'use strict'; - - const paymentPostProcessing = require('payment.post_processing'); +/** @odoo-module **/ + + import paymentPostProcessing from "payment.post_processing"; paymentPostProcessing.include({ /** @@ -22,4 +21,3 @@ odoo.define('payment_custom.post_processing', require => { } } }); -}); diff --git a/addons/payment_demo/static/src/js/payment_form.js b/addons/payment_demo/static/src/js/payment_form.js index 039fbd8b170..32993fc90c2 100644 --- a/addons/payment_demo/static/src/js/payment_form.js +++ b/addons/payment_demo/static/src/js/payment_form.js @@ -1,8 +1,7 @@ -odoo.define('payment_demo.payment_form', require => { - 'use strict'; - - const checkoutForm = require('payment.checkout_form'); - const manageForm = require('payment.manage_form'); +/** @odoo-module **/ + + import checkoutForm from "payment.checkout_form"; + import manageForm from "payment.manage_form"; const paymentDemoMixin = { @@ -61,4 +60,3 @@ odoo.define('payment_demo.payment_form', require => { }; checkoutForm.include(paymentDemoMixin); manageForm.include(paymentDemoMixin); -}); diff --git a/addons/portal/static/src/js/portal.js b/addons/portal/static/src/js/portal.js index fcc4f545a37..6490f89f106 100644 --- a/addons/portal/static/src/js/portal.js +++ b/addons/portal/static/src/js/portal.js @@ -1,10 +1,9 @@ -odoo.define('portal.portal', function (require) { -'use strict'; +/** @odoo-module alias=portal.portal **/ -var publicWidget = require('web.public.widget'); -const Dialog = require('web.Dialog'); -const {_t, qweb} = require('web.core'); -const session = require('web.session'); +import publicWidget from "web.public.widget"; +import Dialog from "web.Dialog"; +import {_t, qweb} from "web.core"; +import session from "web.session"; publicWidget.registry.portalDetails = publicWidget.Widget.extend({ selector: '.o_portal_details', @@ -356,7 +355,6 @@ function handleCheckIdentity(rpc, wrapped) { }); }); } -return { +export default { handleCheckIdentity, } -}); diff --git a/addons/portal/static/src/js/portal_chatter.js b/addons/portal/static/src/js/portal_chatter.js index 3a34228ece3..9501afb1b20 100644 --- a/addons/portal/static/src/js/portal_chatter.js +++ b/addons/portal/static/src/js/portal_chatter.js @@ -1,12 +1,11 @@ -odoo.define('portal.chatter', function (require) { -'use strict'; +/** @odoo-module alias=portal.chatter **/ -var core = require('web.core'); -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'); +import core from "web.core"; +import dom from "web.dom"; +import publicWidget from "web.public.widget"; +import time from "web.time"; +import portalComposer from "portal.composer"; +import {Markup} from "web.utils"; var qweb = core.qweb; var _t = core._t; @@ -339,7 +338,6 @@ publicWidget.registry.portalChatter = publicWidget.Widget.extend({ }, }); -return { +export default { PortalChatter: PortalChatter, }; -}); diff --git a/addons/portal/static/src/js/portal_composer.js b/addons/portal/static/src/js/portal_composer.js index 1925a8a4c2f..25536cd34ff 100644 --- a/addons/portal/static/src/js/portal_composer.js +++ b/addons/portal/static/src/js/portal_composer.js @@ -1,9 +1,8 @@ -odoo.define('portal.composer', function (require) { -'use strict'; +/** @odoo-module alias=portal.composer **/ -var ajax = require('web.ajax'); -var core = require('web.core'); -var publicWidget = require('web.public.widget'); +import ajax from "web.ajax"; +import core from "web.core"; +import publicWidget from "web.public.widget"; var qweb = core.qweb; var _t = core._t; @@ -206,7 +205,6 @@ var PortalComposer = publicWidget.Widget.extend({ }, }); -return { +export default { PortalComposer: PortalComposer, }; -}); diff --git a/addons/portal/static/src/js/portal_sidebar.js b/addons/portal/static/src/js/portal_sidebar.js index d081ddec68d..bc8ceda33cd 100644 --- a/addons/portal/static/src/js/portal_sidebar.js +++ b/addons/portal/static/src/js/portal_sidebar.js @@ -1,10 +1,9 @@ -odoo.define('portal.PortalSidebar', function (require) { -'use strict'; +/** @odoo-module alias=portal.PortalSidebar **/ -var core = require('web.core'); -var publicWidget = require('web.public.widget'); -var time = require('web.time'); -var session = require('web.session'); +import core from "web.core"; +import publicWidget from "web.public.widget"; +import time from "web.time"; +import session from "web.session"; var _t = core._t; @@ -71,5 +70,4 @@ var PortalSidebar = publicWidget.Widget.extend({ } }, }); -return PortalSidebar; -}); +export default PortalSidebar; diff --git a/addons/portal/static/src/js/portal_signature.js b/addons/portal/static/src/js/portal_signature.js index cfb7a457323..533c2ac6784 100644 --- a/addons/portal/static/src/js/portal_signature.js +++ b/addons/portal/static/src/js/portal_signature.js @@ -1,9 +1,8 @@ -odoo.define('portal.signature_form', function (require) { -'use strict'; +/** @odoo-module alias=portal.signature_form **/ -var core = require('web.core'); -var publicWidget = require('web.public.widget'); -var NameAndSignature = require('web.name_and_signature').NameAndSignature; +import core from "web.core"; +import publicWidget from "web.public.widget"; +import { NameAndSignature } from "web.name_and_signature"; var qweb = core.qweb; var _t = core._t; @@ -190,7 +189,6 @@ publicWidget.registry.SignatureForm = publicWidget.Widget.extend({ }, }); -return { +export default { SignatureForm: SignatureForm, }; -}); diff --git a/addons/portal/static/tests/tours/portal.js b/addons/portal/static/tests/tours/portal.js index 4ee27274b44..fa21f437c6d 100644 --- a/addons/portal/static/tests/tours/portal.js +++ b/addons/portal/static/tests/tours/portal.js @@ -1,7 +1,6 @@ -odoo.define('portal.tour', function (require) { -'use strict'; +/** @odoo-module **/ -const { registry } = require("@web/core/registry"); +import { registry } from "@web/core/registry"; registry.category("web_tour.tours").add('portal_load_homepage', { test: true, @@ -17,5 +16,3 @@ registry.category("web_tour.tours").add('portal_load_homepage', { } ] }); - -}); diff --git a/addons/portal_rating/static/src/js/portal_chatter.js b/addons/portal_rating/static/src/js/portal_chatter.js index caeb6667dbd..984397f7b4d 100644 --- a/addons/portal_rating/static/src/js/portal_chatter.js +++ b/addons/portal_rating/static/src/js/portal_chatter.js @@ -1,10 +1,9 @@ -odoo.define('rating.portal.chatter', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var portalChatter = require('portal.chatter'); -var utils = require('web.utils'); -var time = require('web.time'); +import core from "web.core"; +import portalChatter from "portal.chatter"; +import utils from "web.utils"; +import time from "web.time"; var _t = core._t; var PortalChatter = portalChatter.PortalChatter; @@ -380,4 +379,3 @@ PortalChatter.include({ this._changeCurrentPage(1, domain); }, }); -}); diff --git a/addons/portal_rating/static/src/js/portal_composer.js b/addons/portal_rating/static/src/js/portal_composer.js index 7833de0b86c..d36a5d814d5 100644 --- a/addons/portal_rating/static/src/js/portal_composer.js +++ b/addons/portal_rating/static/src/js/portal_composer.js @@ -1,8 +1,7 @@ -odoo.define('rating.portal.composer', function (require) { -'use strict'; +/** @odoo-module **/ -var core = require('web.core'); -var portalComposer = require('portal.composer'); +import core from "web.core"; +import portalComposer from "portal.composer"; var _t = core._t; @@ -169,4 +168,3 @@ PortalComposer.include({ return this._super.apply(this, arguments); }, }); -}); diff --git a/addons/portal_rating/static/src/js/portal_rating_composer.js b/addons/portal_rating/static/src/js/portal_rating_composer.js index 08e723a7430..c3e01e30069 100644 --- a/addons/portal_rating/static/src/js/portal_rating_composer.js +++ b/addons/portal_rating/static/src/js/portal_rating_composer.js @@ -1,10 +1,9 @@ -odoo.define('portal.rating.composer', function (require) { -'use strict'; +/** @odoo-module alias=portal.rating.composer **/ -const publicWidget = require('web.public.widget'); -const session = require('web.session'); -const portalComposer = require('portal.composer'); -const {_t, qweb} = require('web.core'); +import publicWidget from "web.public.widget"; +import session from "web.session"; +import portalComposer from "portal.composer"; +import {_t, qweb} from "web.core"; const PortalComposer = portalComposer.PortalComposer; @@ -123,6 +122,4 @@ const RatingPopupComposer = publicWidget.Widget.extend({ publicWidget.registry.RatingPopupComposer = RatingPopupComposer; -return RatingPopupComposer; - -}); +export default RatingPopupComposer; diff --git a/addons/project/static/src/js/tours/project.js b/addons/project/static/src/js/tours/project.js index 33f0f95b949..7c957ade38a 100644 --- a/addons/project/static/src/js/tours/project.js +++ b/addons/project/static/src/js/tours/project.js @@ -1,10 +1,9 @@ -odoo.define('project.tour', function(require) { -"use strict"; +/** @odoo-module **/ -const {_t} = require('web.core'); -const {Markup} = require('web.utils'); -const { registry } = require("@web/core/registry"); -const { stepUtils } = require('@web_tour/tour_service/tour_utils'); +import {_t} from "web.core"; +import {Markup} from "web.utils"; +import { registry } from "@web/core/registry"; +import { stepUtils } from "@web_tour/tour_service/tour_utils"; registry.category("web_tour.tours").add('project_tour', { sequence: 110, @@ -136,5 +135,3 @@ registry.category("web_tour.tours").add('project_tour', { // last step to confirm we've come back before considering the tour successful auto: true }]}); - -}); diff --git a/addons/purchase/__manifest__.py b/addons/purchase/__manifest__.py index 1d8311943bd..0a617c3517d 100644 --- a/addons/purchase/__manifest__.py +++ b/addons/purchase/__manifest__.py @@ -41,6 +41,7 @@ 'purchase/static/src/toaster_button/*', 'purchase/static/src/views/*.js', 'purchase/static/src/js/tours/purchase.js', + 'purchase/static/src/js/tours/purchase_steps.js', 'purchase/static/src/**/*.xml', ], 'web.assets_frontend': [ diff --git a/addons/purchase/static/src/js/purchase_portal_sidebar.js b/addons/purchase/static/src/js/purchase_portal_sidebar.js index 20a9b6b57d9..e924b5679f6 100644 --- a/addons/purchase/static/src/js/purchase_portal_sidebar.js +++ b/addons/purchase/static/src/js/purchase_portal_sidebar.js @@ -1,18 +1,17 @@ -odoo.define('purchase.PurchasePortalSidebar', function (require) { -'use strict'; +/** @odoo-module **/ -var publicWidget = require('web.public.widget'); -var PortalSidebar = require('portal.PortalSidebar'); +import publicWidget from "web.public.widget"; +import PortalSidebar from "portal.PortalSidebar"; publicWidget.registry.PurchasePortalSidebar = PortalSidebar.extend({ - selector: '.o_portal_purchase_sidebar', + selector: ".o_portal_purchase_sidebar", /** * @constructor */ init: function (parent, options) { this._super.apply(this, arguments); - this.authorizedTextTag = ['em', 'b', 'i', 'u']; + this.authorizedTextTag = ["em", "b", "i", "u"]; this.spyWatched = $('body[data-target=".navspy"]'); }, /** @@ -41,7 +40,7 @@ publicWidget.registry.PurchasePortalSidebar = PortalSidebar.extend({ */ _setElementId: function (prefix, $el) { var id = _.uniqueId(prefix); - this.spyWatched.find($el).attr('id', id); + this.spyWatched.find($el).attr("id", id); return id; }, /** @@ -54,23 +53,32 @@ publicWidget.registry.PurchasePortalSidebar = PortalSidebar.extend({ var self = this, lastLI = false, lastUL = null, - $bsSidenav = this.$el.find('.bs-sidenav'); + $bsSidenav = this.$el.find(".bs-sidenav"); - $("#quote_content [id^=quote_header_], #quote_content [id^=quote_]", this.spyWatched).attr("id", ""); + $("#quote_content [id^=quote_header_], #quote_content [id^=quote_]", this.spyWatched).attr( + "id", + "" + ); _.each(this.spyWatched.find("#quote_content h2, #quote_content h3"), function (el) { var id, text; switch (el.tagName.toLowerCase()) { case "h2": - id = self._setElementId('quote_header_', el); + id = self._setElementId("quote_header_", el); text = self._extractText($(el)); if (!text) { break; } - lastLI = $("
  • ").append($('').text(text)).appendTo($bsSidenav); + lastLI = $("
  • ") + .append( + $( + '' + ).text(text) + ) + .appendTo($bsSidenav); lastUL = false; break; case "h3": - id = self._setElementId('quote_', el); + id = self._setElementId("quote_", el); text = self._extractText($(el)); if (!text) { break; @@ -79,13 +87,21 @@ publicWidget.registry.PurchasePortalSidebar = PortalSidebar.extend({ if (!lastUL) { lastUL = $("