diff --git a/addons/l10n_ae_pos/__manifest__.py b/addons/l10n_ae_pos/__manifest__.py index 3c81791129d..8e7eb4214c6 100644 --- a/addons/l10n_ae_pos/__manifest__.py +++ b/addons/l10n_ae_pos/__manifest__.py @@ -14,7 +14,7 @@ United Arab Emirates POS Localization 'license': 'LGPL-3', 'assets': { 'point_of_sale._assets_pos': [ - 'l10n_ae_pos/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml', + 'l10n_ae_pos/static/src/**/*', ], }, } diff --git a/addons/l10n_co_pos/__manifest__.py b/addons/l10n_co_pos/__manifest__.py index 1af0e9ee38c..050571b747a 100644 --- a/addons/l10n_co_pos/__manifest__.py +++ b/addons/l10n_co_pos/__manifest__.py @@ -17,8 +17,7 @@ ], 'assets': { 'point_of_sale._assets_pos': [ - 'l10n_co_pos/static/src/js/**/*', - 'l10n_co_pos/static/src/xml/**/*', + 'l10n_co_pos/static/src/**/*', ], }, 'license': 'LGPL-3', diff --git a/addons/l10n_fr_pos_cert/__manifest__.py b/addons/l10n_fr_pos_cert/__manifest__.py index ac8494bd226..c856f9d46d9 100644 --- a/addons/l10n_fr_pos_cert/__manifest__.py +++ b/addons/l10n_fr_pos_cert/__manifest__.py @@ -37,9 +37,7 @@ The module adds following features: 'post_init_hook': '_setup_inalterability', 'assets': { 'point_of_sale._assets_pos': [ - 'l10n_fr_pos_cert/static/src/js/**/*', - 'l10n_fr_pos_cert/static/src/css/pos.css', - 'l10n_fr_pos_cert/static/src/xml/**/*', + 'l10n_fr_pos_cert/static/src/**/*', ], }, 'license': 'LGPL-3', diff --git a/addons/l10n_gcc_pos/__manifest__.py b/addons/l10n_gcc_pos/__manifest__.py index fde3fa178b1..fdab4b1fe74 100644 --- a/addons/l10n_gcc_pos/__manifest__.py +++ b/addons/l10n_gcc_pos/__manifest__.py @@ -11,9 +11,7 @@ GCC POS Localization 'depends': ['point_of_sale', 'l10n_gcc_invoice'], 'assets': { 'point_of_sale._assets_pos': [ - 'l10n_gcc_pos/static/src/js/OrderReceipt.js', - 'l10n_gcc_pos/static/src/css/OrderReceipt.css', - 'l10n_gcc_pos/static/src/xml/OrderReceipt.xml', + 'l10n_gcc_pos/static/src/**/*', ] }, 'auto_install': True, diff --git a/addons/l10n_in_pos/__manifest__.py b/addons/l10n_in_pos/__manifest__.py index df73308eddf..3adee9288c8 100644 --- a/addons/l10n_in_pos/__manifest__.py +++ b/addons/l10n_in_pos/__manifest__.py @@ -17,8 +17,7 @@ 'auto_install': True, 'assets': { 'point_of_sale._assets_pos': [ - 'l10n_in_pos/static/src/js/**/*', - 'l10n_in_pos/static/src/xml/**/*', + 'l10n_in_pos/static/src/**/*', ], }, 'license': 'LGPL-3', diff --git a/addons/l10n_sa_pos/__manifest__.py b/addons/l10n_sa_pos/__manifest__.py index 4aac369bf69..e3aa0189265 100644 --- a/addons/l10n_sa_pos/__manifest__.py +++ b/addons/l10n_sa_pos/__manifest__.py @@ -16,8 +16,7 @@ K.S.A. POS Localization 'assets': { 'point_of_sale._assets_pos': [ 'web/static/lib/zxing-library/zxing-library.js', - 'l10n_sa_pos/static/src/js/models.js', - 'l10n_sa_pos/static/src/xml/OrderReceipt.xml', + 'l10n_sa_pos/static/src/**/*', ] }, 'auto_install': True, diff --git a/addons/pos_adyen/static/src/overrides/models/models.js b/addons/pos_adyen/static/src/overrides/models/models.js index 95f07a7bf7f..46ba95fb92e 100644 --- a/addons/pos_adyen/static/src/overrides/models/models.js +++ b/addons/pos_adyen/static/src/overrides/models/models.js @@ -1,7 +1,7 @@ /** @odoo-module */ import { register_payment_method } from "@point_of_sale/app/store/pos_store"; import { Payment } from "@point_of_sale/app/store/models"; -import { PaymentAdyen } from "@pos_adyen/js/payment_adyen"; +import { PaymentAdyen } from "@pos_adyen/app/payment_adyen"; import { patch } from "@web/core/utils/patch"; register_payment_method("adyen", PaymentAdyen); diff --git a/addons/pos_discount/__manifest__.py b/addons/pos_discount/__manifest__.py index 068a4ad1671..aac04eaf626 100644 --- a/addons/pos_discount/__manifest__.py +++ b/addons/pos_discount/__manifest__.py @@ -22,8 +22,7 @@ discount to a customer. 'installable': True, 'assets': { 'point_of_sale._assets_pos': [ - 'pos_discount/static/src/js/**/*', - 'pos_discount/static/src/xml/**/*', + 'pos_discount/static/src/**/*', ], }, 'license': 'LGPL-3', diff --git a/addons/pos_epson_printer/__manifest__.py b/addons/pos_epson_printer/__manifest__.py index 1ec8ce1a620..58dc5464165 100644 --- a/addons/pos_epson_printer/__manifest__.py +++ b/addons/pos_epson_printer/__manifest__.py @@ -22,8 +22,7 @@ Use Epson ePOS Printers without the IoT Box in the Point of Sale 'auto_install': True, 'assets': { 'point_of_sale._assets_pos': [ - 'pos_epson_printer/static/src/js/**/*', - 'pos_epson_printer/static/src/xml/**/*', + 'pos_epson_printer/static/src/**/*', ], }, 'license': 'LGPL-3', diff --git a/addons/pos_epson_printer/static/src/overrides/models/models.js b/addons/pos_epson_printer/static/src/overrides/models/models.js index 837149f33c2..89be3fd9ea7 100644 --- a/addons/pos_epson_printer/static/src/overrides/models/models.js +++ b/addons/pos_epson_printer/static/src/overrides/models/models.js @@ -1,7 +1,7 @@ /** @odoo-module */ import { PosStore } from "@point_of_sale/app/store/pos_store"; -import { EpsonPrinter } from "@pos_epson_printer/js/epson_printer"; +import { EpsonPrinter } from "@pos_epson_printer/app/epson_printer"; import { patch } from "@web/core/utils/patch"; patch(PosStore.prototype, "pos_epson_printer.PosStore", { diff --git a/addons/pos_hr/__manifest__.py b/addons/pos_hr/__manifest__.py index 878180c4382..35998b208f5 100644 --- a/addons/pos_hr/__manifest__.py +++ b/addons/pos_hr/__manifest__.py @@ -23,14 +23,7 @@ The actual till still requires one user but an unlimited number of employees can 'auto_install': True, 'assets': { 'point_of_sale._assets_pos': [ - 'pos_hr/static/src/css/pos.css', - 'pos_hr/static/src/js/models.js', - 'pos_hr/static/src/js/SelectCashierMixin.js', - 'pos_hr/static/src/js/CashierName.js', - 'pos_hr/static/src/js/LoginScreen.js', - 'pos_hr/static/src/js/PaymentScreen.js', - 'pos_hr/static/src/xml/**/*', - 'pos_hr/static/src/app/**/*', + 'pos_hr/static/src/**/*', ], 'web.assets_tests': [ 'pos_hr/static/tests/**/*', diff --git a/addons/pos_hr/static/src/app/login_screen/login_screen.js b/addons/pos_hr/static/src/app/login_screen/login_screen.js index f4e13219513..3a0965aa0eb 100644 --- a/addons/pos_hr/static/src/app/login_screen/login_screen.js +++ b/addons/pos_hr/static/src/app/login_screen/login_screen.js @@ -1,6 +1,6 @@ /** @odoo-module */ -import { useCashierSelector } from "@pos_hr/js/SelectCashierMixin"; +import { useCashierSelector } from "@pos_hr/app/select_cashier_mixin"; import { registry } from "@web/core/registry"; import { usePos } from "@point_of_sale/app/store/pos_hook"; import { Component } from "@odoo/owl"; diff --git a/addons/pos_hr/static/src/overrides/components/cashier_name/cashier_name.js b/addons/pos_hr/static/src/overrides/components/cashier_name/cashier_name.js index bd21044ccfc..d2f6d645106 100644 --- a/addons/pos_hr/static/src/overrides/components/cashier_name/cashier_name.js +++ b/addons/pos_hr/static/src/overrides/components/cashier_name/cashier_name.js @@ -2,7 +2,7 @@ import { CashierName } from "@point_of_sale/app/navbar/cashier_name/cashier_name"; import { patch } from "@web/core/utils/patch"; -import { useCashierSelector } from "@pos_hr/js/SelectCashierMixin"; +import { useCashierSelector } from "@pos_hr/app/select_cashier_mixin"; patch(CashierName.prototype, "pos_hr.CashierName", { setup() { diff --git a/addons/pos_hr_restaurant/static/src/overrides/models/pos_store.js b/addons/pos_hr_restaurant/static/src/overrides/models/pos_store.js index 1dc7b6ea822..070a184a682 100644 --- a/addons/pos_hr_restaurant/static/src/overrides/models/pos_store.js +++ b/addons/pos_hr_restaurant/static/src/overrides/models/pos_store.js @@ -1,7 +1,7 @@ /* @odoo-module alias=pos_restaurant_hr.chrome */ import { patch } from "@web/core/utils/patch"; -import "@pos_restaurant/app/pos_store"; +import "@pos_restaurant/overrides/models/pos_store"; import { PosStore } from "@point_of_sale/app/store/pos_store"; patch(PosStore.prototype, "pos_hr_restaurant.PosStore", { diff --git a/addons/pos_loyalty/__init__.py b/addons/pos_loyalty/__init__.py index dc5e6b693d1..90b17558ffc 100644 --- a/addons/pos_loyalty/__init__.py +++ b/addons/pos_loyalty/__init__.py @@ -2,3 +2,4 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from . import models +from . import tests diff --git a/addons/pos_loyalty/__manifest__.py b/addons/pos_loyalty/__manifest__.py index a05c1579cec..0494b49c39c 100644 --- a/addons/pos_loyalty/__manifest__.py +++ b/addons/pos_loyalty/__manifest__.py @@ -26,13 +26,10 @@ 'auto_install': True, 'assets': { 'point_of_sale._assets_pos': [ - 'pos_loyalty/static/src/css/Loyalty.scss', - 'pos_loyalty/static/src/app/**/*', - 'pos_loyalty/static/src/js/**/*', - 'pos_loyalty/static/src/xml/**/*', + 'pos_loyalty/static/src/**/*', ], 'web.assets_tests': [ - 'pos_loyalty/static/src/tours/**/*', + 'pos_loyalty/static/tests/tours/**/*', ], }, 'license': 'LGPL-3', diff --git a/addons/pos_loyalty/static/src/overrides/components/payment_screen/payment_screen.js b/addons/pos_loyalty/static/src/overrides/components/payment_screen/payment_screen.js index ccc2d773fff..325eb39acd5 100644 --- a/addons/pos_loyalty/static/src/overrides/components/payment_screen/payment_screen.js +++ b/addons/pos_loyalty/static/src/overrides/components/payment_screen/payment_screen.js @@ -2,7 +2,7 @@ import { PaymentScreen } from "@point_of_sale/app/screens/payment_screen/payment_screen"; import { patch } from "@web/core/utils/patch"; -import { PosLoyaltyCard } from "@pos_loyalty/js/Loyalty"; +import { PosLoyaltyCard } from "@pos_loyalty/overrides/models/loyalty"; import { ErrorPopup } from "@point_of_sale/app/errors/popups/error_popup"; patch(PaymentScreen.prototype, "pos_loyalty.PaymentScreen", { diff --git a/addons/pos_loyalty/static/src/overrides/models/pos_store.js b/addons/pos_loyalty/static/src/overrides/models/pos_store.js index a466f69af00..131fc6fd415 100644 --- a/addons/pos_loyalty/static/src/overrides/models/pos_store.js +++ b/addons/pos_loyalty/static/src/overrides/models/pos_store.js @@ -8,7 +8,7 @@ import { ErrorPopup } from "@point_of_sale/app/errors/popups/error_popup"; import { TextInputPopup } from "@point_of_sale/app/utils/input_popups/text_input_popup"; import { Domain, InvalidDomainError } from "@web/core/domain"; import { sprintf } from "@web/core/utils/strings"; -import { PosLoyaltyCard } from "@pos_loyalty/js/Loyalty"; +import { PosLoyaltyCard } from "@pos_loyalty/overrides/models/loyalty"; const COUPON_CACHE_MAX_SIZE = 4096; // Maximum coupon cache size, prevents long run memory issues and (to some extent) invalid data diff --git a/addons/pos_loyalty/static/tests/tours/EWalletProgramTours.js b/addons/pos_loyalty/static/tests/tours/EWalletProgramTours.js index 238a2d3bc6d..0c8388130fa 100644 --- a/addons/pos_loyalty/static/tests/tours/EWalletProgramTours.js +++ b/addons/pos_loyalty/static/tests/tours/EWalletProgramTours.js @@ -1,6 +1,6 @@ /** @odoo-module **/ -import { PosLoyalty } from "@pos_loyalty/tours/PosLoyaltyTourMethods"; +import { PosLoyalty } from "@pos_loyalty/../tests/tours/PosLoyaltyTourMethods"; import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScreenTourMethods"; import { TicketScreen } from "@point_of_sale/../tests/tours/helpers/TicketScreenTourMethods"; import { Chrome } from "@point_of_sale/../tests/tours/helpers/ChromeTourMethods"; diff --git a/addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js b/addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js index c7513d38d73..344ddf1e503 100644 --- a/addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js +++ b/addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js @@ -1,6 +1,6 @@ /** @odoo-module **/ -import { PosLoyalty } from "@pos_loyalty/tours/PosLoyaltyTourMethods"; +import { PosLoyalty } from "@pos_loyalty/../tests/tours/PosLoyaltyTourMethods"; import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScreenTourMethods"; import { TextInputPopup } from "@point_of_sale/../tests/tours/helpers/TextInputPopupTourMethods"; import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils"; diff --git a/addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js b/addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js index 2b5ede32dcb..99adaf466f1 100644 --- a/addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js +++ b/addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js @@ -1,6 +1,6 @@ /** @odoo-module **/ -import { PosLoyalty } from "@pos_loyalty/tours/PosLoyaltyTourMethods"; +import { PosLoyalty } from "@pos_loyalty/../tests/tours/PosLoyaltyTourMethods"; import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScreenTourMethods"; import { SelectionPopup } from "@point_of_sale/../tests/tours/helpers/SelectionPopupTourMethods"; import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils"; diff --git a/addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js index 61d0544c371..6c77bf69902 100644 --- a/addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js +++ b/addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js @@ -1,6 +1,6 @@ /** @odoo-module **/ -import { PosLoyalty } from "@pos_loyalty/tours/PosLoyaltyTourMethods"; +import { PosLoyalty } from "@pos_loyalty/../tests/tours/PosLoyaltyTourMethods"; import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScreenTourMethods"; import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils"; import { registry } from "@web/core/registry"; diff --git a/addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js index e742b47f7ba..8e5332294b8 100644 --- a/addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js +++ b/addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js @@ -1,6 +1,6 @@ /** @odoo-module **/ -import { PosLoyalty } from "@pos_loyalty/tours/PosLoyaltyTourMethods"; +import { PosLoyalty } from "@pos_loyalty/../tests/tours/PosLoyaltyTourMethods"; import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScreenTourMethods"; import { SelectionPopup } from "@point_of_sale/../tests/tours/helpers/SelectionPopupTourMethods"; import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils"; diff --git a/addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js index 75bfd5866f1..39e8d37028d 100644 --- a/addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js +++ b/addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js @@ -1,6 +1,6 @@ /** @odoo-module **/ -import { PosLoyalty } from "@pos_loyalty/tours/PosLoyaltyTourMethods"; +import { PosLoyalty } from "@pos_loyalty/../tests/tours/PosLoyaltyTourMethods"; import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScreenTourMethods"; import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils"; import { registry } from "@web/core/registry"; diff --git a/addons/pos_loyalty/static/tests/tours/PosLoyaltyValidityTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyValidityTour.js index 54d65dc3ce9..b5239137cde 100644 --- a/addons/pos_loyalty/static/tests/tours/PosLoyaltyValidityTour.js +++ b/addons/pos_loyalty/static/tests/tours/PosLoyaltyValidityTour.js @@ -1,6 +1,6 @@ /** @odoo-module **/ -import { PosLoyalty } from "@pos_loyalty/tours/PosLoyaltyTourMethods"; +import { PosLoyalty } from "@pos_loyalty/../tests/tours/PosLoyaltyTourMethods"; import { ProductScreen } from "@point_of_sale/../tests/tours/helpers/ProductScreenTourMethods"; import { getSteps, startSteps } from "@point_of_sale/../tests/tours/helpers/utils"; import { registry } from "@web/core/registry"; diff --git a/addons/pos_mercury/__manifest__.py b/addons/pos_mercury/__manifest__.py index 4be1512fbab..bf476d9b355 100644 --- a/addons/pos_mercury/__manifest__.py +++ b/addons/pos_mercury/__manifest__.py @@ -35,14 +35,7 @@ following: 'installable': True, 'assets': { 'point_of_sale._assets_pos': [ - 'pos_mercury/static/src/js/pos_mercury.js', - 'pos_mercury/static/src/js/OrderReceipt.js', - 'pos_mercury/static/src/js/PaymentScreen.js', - 'pos_mercury/static/src/js/PaymentScreenPaymentLines.js', - 'pos_mercury/static/src/js/PaymentTransactionPopup.js', - 'pos_mercury/static/src/js/ProductScreen.js', - 'pos_mercury/static/src/css/pos_mercury.css', - 'pos_mercury/static/src/xml/**/*', + 'pos_mercury/static/src/**/*', ], }, 'license': 'LGPL-3', diff --git a/addons/pos_mercury/static/src/overrides/components/payment_screen/payment_screen.js b/addons/pos_mercury/static/src/overrides/components/payment_screen/payment_screen.js index 804d7f7aea5..a4733292e21 100644 --- a/addons/pos_mercury/static/src/overrides/components/payment_screen/payment_screen.js +++ b/addons/pos_mercury/static/src/overrides/components/payment_screen/payment_screen.js @@ -5,7 +5,7 @@ import { patch } from "@web/core/utils/patch"; import { PaymentScreen } from "@point_of_sale/app/screens/payment_screen/payment_screen"; import { useBarcodeReader } from "@point_of_sale/app/barcode/barcode_reader_hook"; import { ErrorPopup } from "@point_of_sale/app/errors/popups/error_popup"; -import { PaymentTransactionPopup } from "@pos_mercury/js/PaymentTransactionPopup"; +import { PaymentTransactionPopup } from "@pos_mercury/app/payment_transaction_popup/payment_transaction_popup"; import { SelectionPopup } from "@point_of_sale/app/utils/input_popups/selection_popup"; // Lookup table to store status and error messages diff --git a/addons/pos_restaurant/__manifest__.py b/addons/pos_restaurant/__manifest__.py index fdff2235057..e5856219519 100644 --- a/addons/pos_restaurant/__manifest__.py +++ b/addons/pos_restaurant/__manifest__.py @@ -32,10 +32,8 @@ This module adds several features to the Point of Sale that are specific to rest 'installable': True, 'assets': { 'point_of_sale._assets_pos': [ - 'pos_restaurant/static/src/js/**/*.js', + 'pos_restaurant/static/src/**/*', ('after', 'point_of_sale/static/src/scss/pos.scss', 'pos_restaurant/static/src/scss/restaurant.scss'), - 'pos_restaurant/static/src/xml/**/*', - 'pos_restaurant/static/src/app/**/*', ], 'web.assets_backend': [ 'point_of_sale/static/src/scss/pos_dashboard.scss', diff --git a/addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.js b/addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.js index f41c99868e2..986f985efc2 100644 --- a/addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.js +++ b/addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.js @@ -2,7 +2,7 @@ import { Order } from "@point_of_sale/app/store/models"; -import { SplitOrderline } from "@pos_restaurant/js/Screens/SplitBillScreen/SplitOrderline"; +import { SplitOrderline } from "@pos_restaurant/app/split_bill_screen/split_orderline/split_orderline"; import { registry } from "@web/core/registry"; import { usePos } from "@point_of_sale/app/store/pos_hook"; import { Component, useState } from "@odoo/owl"; diff --git a/addons/pos_restaurant/static/src/overrides/components/navbar/back_button/back_button.js b/addons/pos_restaurant/static/src/overrides/components/navbar/back_button/back_button.js index ef2ca54dcba..156800d6de0 100644 --- a/addons/pos_restaurant/static/src/overrides/components/navbar/back_button/back_button.js +++ b/addons/pos_restaurant/static/src/overrides/components/navbar/back_button/back_button.js @@ -2,7 +2,7 @@ import { BackButton } from "@point_of_sale/app/navbar/back_button/back_button"; import { ProductScreen } from "@point_of_sale/app/screens/product_screen/product_screen"; -import { TipScreen } from "@pos_restaurant/js/Screens/TipScreen"; +import { TipScreen } from "@pos_restaurant/app/tip_screen/tip_screen"; import { patch } from "@web/core/utils/patch"; patch(BackButton.prototype, "pos_restaurant.BackButton", { diff --git a/addons/pos_restaurant/static/src/overrides/models/pos_store.js b/addons/pos_restaurant/static/src/overrides/models/pos_store.js index 77f2a67369c..cb056b475a5 100644 --- a/addons/pos_restaurant/static/src/overrides/models/pos_store.js +++ b/addons/pos_restaurant/static/src/overrides/models/pos_store.js @@ -5,7 +5,7 @@ import { PosStore } from "@point_of_sale/app/store/pos_store"; import { PaymentScreen } from "@point_of_sale/app/screens/payment_screen/payment_screen"; import { ProductScreen } from "@point_of_sale/app/screens/product_screen/product_screen"; import { FloorScreen } from "@pos_restaurant/app/floor_screen/floor_screen"; -import { TipScreen } from "@pos_restaurant/js/Screens/TipScreen"; +import { TipScreen } from "@pos_restaurant/app/tip_screen/tip_screen"; import { ConnectionLostError } from "@web/core/network/rpc_service"; const NON_IDLE_EVENTS = [ diff --git a/addons/pos_restaurant_adyen/static/src/overrides/models/payment_adyen.js b/addons/pos_restaurant_adyen/static/src/overrides/models/payment_adyen.js index e07b6f2dfab..1ae17b740ac 100644 --- a/addons/pos_restaurant_adyen/static/src/overrides/models/payment_adyen.js +++ b/addons/pos_restaurant_adyen/static/src/overrides/models/payment_adyen.js @@ -1,6 +1,6 @@ /** @odoo-module */ -import { PaymentAdyen } from "@pos_adyen/js/payment_adyen"; +import { PaymentAdyen } from "@pos_adyen/app/payment_adyen"; import { patch } from "@web/core/utils/patch"; patch(PaymentAdyen.prototype, "pos_restaurant_adyen.PaymentAdyen", { diff --git a/addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js b/addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js index 6231433c46d..2a52d7cd58c 100644 --- a/addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js +++ b/addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js @@ -1,6 +1,6 @@ /** @odoo-module */ -import { PaymentStripe } from "@pos_stripe/js/payment_stripe"; +import { PaymentStripe } from "@pos_stripe/app/payment_stripe"; import { patch } from "@web/core/utils/patch"; patch(PaymentStripe.prototype, "pos_restaurant_stripe.PaymentStripe", { diff --git a/addons/pos_sale/static/src/app/order_management_screen/sale_order_list/sale_order_list.js b/addons/pos_sale/static/src/app/order_management_screen/sale_order_list/sale_order_list.js index 41551226dcb..eeb4bd929aa 100644 --- a/addons/pos_sale/static/src/app/order_management_screen/sale_order_list/sale_order_list.js +++ b/addons/pos_sale/static/src/app/order_management_screen/sale_order_list/sale_order_list.js @@ -1,7 +1,7 @@ /** @odoo-module */ import { Component, useState } from "@odoo/owl"; -import { SaleOrderRow } from "@pos_sale/js/OrderManagementScreen/SaleOrderRow"; +import { SaleOrderRow } from "@pos_sale/app/order_management_screen/sale_order_row/sale_order_row"; import { useService } from "@web/core/utils/hooks"; /** diff --git a/addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.js b/addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.js index 906f6de3eeb..07c21a6d8c7 100644 --- a/addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.js +++ b/addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.js @@ -12,8 +12,8 @@ import { ErrorPopup } from "@point_of_sale/app/errors/popups/error_popup"; import { ConfirmPopup } from "@point_of_sale/app/utils/confirm_popup/confirm_popup"; import { NumberPopup } from "@point_of_sale/app/utils/input_popups/number_popup"; -import { SaleOrderList } from "@pos_sale/js/OrderManagementScreen/SaleOrderList"; -import { SaleOrderManagementControlPanel } from "@pos_sale/js/OrderManagementScreen/SaleOrderManagementControlPanel"; +import { SaleOrderList } from "@pos_sale/app/order_management_screen/sale_order_list/sale_order_list"; +import { SaleOrderManagementControlPanel } from "@pos_sale/app/order_management_screen/sale_order_management_control_panel/sale_order_management_control_panel"; import { Component, onMounted, useRef } from "@odoo/owl"; import { usePos } from "@point_of_sale/app/store/pos_hook"; diff --git a/addons/pos_sale_loyalty/__manifest__.py b/addons/pos_sale_loyalty/__manifest__.py index 50decddc585..3564478fbf9 100644 --- a/addons/pos_sale_loyalty/__manifest__.py +++ b/addons/pos_sale_loyalty/__manifest__.py @@ -16,7 +16,7 @@ This module correct some behaviors when both module are installed. 'auto_install': True, 'assets': { 'point_of_sale._assets_pos': [ - 'pos_sale_loyalty/static/src/js/**/*.js', + 'pos_sale_loyalty/static/src/**/*', ], }, 'license': 'LGPL-3', diff --git a/addons/pos_sale_product_configurator/__manifest__.py b/addons/pos_sale_product_configurator/__manifest__.py index 1438d0485d7..387835f0971 100644 --- a/addons/pos_sale_product_configurator/__manifest__.py +++ b/addons/pos_sale_product_configurator/__manifest__.py @@ -15,9 +15,7 @@ This module adds features depending on both modules. 'auto_install': True, 'assets': { 'point_of_sale._assets_pos': [ - 'pos_sale_product_configurator/static/src/js/**/*', - 'pos_sale_product_configurator/static/src/css/popups/product_info_popup.css', - 'pos_sale_product_configurator/static/src/xml/**/*' + 'pos_sale_product_configurator/static/src/**/*', ] }, 'license': 'LGPL-3', diff --git a/addons/pos_six/__manifest__.py b/addons/pos_six/__manifest__.py index 276d33cb65c..0ce38bb0ae5 100644 --- a/addons/pos_six/__manifest__.py +++ b/addons/pos_six/__manifest__.py @@ -15,11 +15,7 @@ 'assets': { 'point_of_sale._assets_pos': [ 'pos_six/static/lib/six_timapi/timapi.js', - 'pos_six/static/src/js/BalanceButton.js', - 'pos_six/static/src/js/models.js', - 'pos_six/static/src/js/payment_six.js', - 'pos_six/static/src/xml/**/*', - 'pos_six/static/src/app/**/*', + 'pos_six/static/src/**/*', ], } } diff --git a/addons/pos_six/static/src/overrides/models/models.js b/addons/pos_six/static/src/overrides/models/models.js index 08dcee81e27..8e213e85a61 100644 --- a/addons/pos_six/static/src/overrides/models/models.js +++ b/addons/pos_six/static/src/overrides/models/models.js @@ -1,6 +1,6 @@ /** @odoo-module */ import { register_payment_method } from "@point_of_sale/app/store/pos_store"; -import { PaymentSix } from "@pos_six/js/payment_six"; +import { PaymentSix } from "@pos_six/app/payment_six"; register_payment_method("six", PaymentSix); diff --git a/addons/pos_stripe/static/src/overrides/models/models.js b/addons/pos_stripe/static/src/overrides/models/models.js index 9b9a7569b3c..1dda725857f 100644 --- a/addons/pos_stripe/static/src/overrides/models/models.js +++ b/addons/pos_stripe/static/src/overrides/models/models.js @@ -1,5 +1,5 @@ /** @odoo-module */ import { register_payment_method } from "@point_of_sale/app/store/pos_store"; -import { PaymentStripe } from "@pos_stripe/js/payment_stripe"; +import { PaymentStripe } from "@pos_stripe/app/payment_stripe"; register_payment_method("stripe", PaymentStripe);