From bd1331f81e09ae61537b931f47ecb46e141b6ba0 Mon Sep 17 00:00:00 2001 From: vlst Date: Mon, 3 Jul 2023 09:09:39 +0000 Subject: [PATCH 1/2] [REF] pos*: structure static files pos*: l10n_ae_pos,l10n_co_pos,l10n_gcc_pos,l10n_in_pos, l10n_sa_pos,pos_adyen,pos_discount,pos_epson_printer, pos_hr,pos_hr_restaurant,pos_loyalty,pos_mercury, pos_restaurant,pos_restaurant_adyen,pos_restaurant_stripe,pos_sale, pos_sale_loyalty,pos_sale_product_configurator,pos_six,pos_stripe, The POS has a large number of add-on modules. As such, it is important that they all respect strict guidelines when it comes to file structures. Before, each module had more or less it's own rules when it came to this, apart from the fact that code was mostly organised into `js` and `xml` folders. In this PR, we move to a much more structured approach, in which each module follows the following pattern: src/ |-- app/ <-- the module's own new logic |-- overrides/ | |-- components | | |-- overridden_component_a | | | |-- overridden_component_a.js | | | |-- overridden_component_a.xml | | | |-- overridden_component_a.css | |-- models | | |-- overridden_model.js Apart from the structural changes, this PR introduces changes to file names, such that they respect the default pattern of snake_case naming. In this commit, we move the files. In the following one we make the needed changes in the code, such as adapting imports. In order to efficiently accomplish this task, i used the following [script](https://github.com/vlst-odoo/tools/blob/main/rename.py) Task: 3394192 Part-of: odoo/odoo#127056 --- .../components/order_receipt/order_receipt.xml} | 0 .../components/order_receipt/order_receipt.xml} | 0 .../components/payment_screen/payment_screen.js} | 0 addons/l10n_co_pos/static/src/{js => overrides/models}/pos.js | 0 .../components/order_receipt/order_receipt.js} | 0 .../components/order_receipt/order_receipt.xml} | 0 .../static/src/{xml => overrides/components}/pos_receipt.xml | 0 .../static/src/{js/receipt.js => overrides/models/orderline.js} | 0 .../components/order_receipt/order_receipt.xml} | 0 .../l10n_sa_pos/static/src/{js => overrides/models}/models.js | 0 addons/pos_adyen/static/src/{js => app}/payment_adyen.js | 0 .../components/payment_screen/payment_screen.js} | 0 addons/pos_adyen/static/src/{js => overrides/models}/models.js | 0 .../components/discount_button/discount_button.js} | 0 .../components/discount_button/discount_button.xml} | 0 .../pos_discount/static/src/{js => overrides/models}/models.js | 0 .../static/src/{xml => app/components}/epos_templates.xml | 0 .../pos_epson_printer/static/src/{js => app}/epson_printer.js | 0 .../static/src/{js => overrides/models}/models.js | 0 .../header_lock_button/header_lock_button.js} | 0 .../header_lock_button/header_lock_button.xml} | 0 .../src/{js/LoginScreen.js => app/login_screen/login_screen.js} | 0 .../{xml/LoginScreen.xml => app/login_screen/login_screen.xml} | 0 .../{js/SelectCashierMixin.js => app/select_cashier_mixin.js} | 0 .../components/cashier_name/cashier_name.js} | 0 .../components/cashier_name/cashier_name.xml} | 0 .../static/src/{app => overrides/components/navbar}/navbar.js | 0 .../static/src/{app => overrides/components/navbar}/navbar.xml | 0 .../components/payment_screen/payment_screen.js} | 0 addons/pos_hr/static/src/{js => overrides/models}/Chrome.js | 0 addons/pos_hr/static/src/{js => overrides/models}/models.js | 0 addons/pos_hr/static/src/{app => overrides/models}/pos_store.js | 0 .../static/src/{app => overrides/models}/pos_store.js | 0 .../control_buttons/e_wallet_button/e_wallet_button.js} | 0 .../control_buttons/e_wallet_button/e_wallet_button.xml} | 0 .../control_buttons/promo_code_button/promo_code_button.js} | 0 .../control_buttons/promo_code_button/promo_code_button.xml} | 0 .../reset_programs_button/reset_programs_button.js} | 0 .../reset_programs_button/reset_programs_button.xml} | 0 .../control_buttons/reward_button/reward_button.js} | 0 .../control_buttons/reward_button/reward_button.xml} | 0 .../components/order_receipt/order_receipt.xml} | 0 .../components/order_summary/order_summary.js} | 0 .../components/order_summary/order_summary.xml} | 0 .../components/orderline/orderline.js} | 0 .../components/orderline/orderline.xml} | 0 .../components/partner_line/partner_line.js} | 0 .../components/partner_line/partner_line.xml} | 0 .../components/partner_list_screen/partner_list_screen.js} | 0 .../components/payment_screen/payment_screen.js} | 0 .../components/product_screen/product_screen.js} | 0 .../components/ticket_screen/ticket_screen.js} | 0 .../static/src/{js/Loyalty.js => overrides/models/loyalty.js} | 0 .../static/src/{app => overrides/models}/pos_store.js | 0 .../static/{src => tests}/tours/EWalletProgramTours.js | 0 .../static/{src => tests}/tours/GiftCardProgramTours.js | 0 .../{src => tests}/tours/MultipleGiftWalletProgramsTour.js | 0 .../static/{src => tests}/tours/PosLoyaltyLoyaltyProgramTour.js | 0 .../static/{src => tests}/tours/PosLoyaltyRewardButtonTour.js | 0 .../pos_loyalty/static/{src => tests}/tours/PosLoyaltyTour.js | 0 .../static/{src => tests}/tours/PosLoyaltyTourMethods.js | 0 .../static/{src => tests}/tours/PosLoyaltyValidityTour.js | 0 .../payment_transaction_popup/payment_transaction_popup.js} | 0 .../payment_transaction_popup/payment_transaction_popup.xml} | 0 .../components/order_receipt/order_receipt.js} | 0 .../components/order_receipt/order_receipt.xml} | 0 .../components/payment_screen/payment_screen.js} | 0 .../payment_screen_payment_lines.js} | 0 .../payment_screen_payment_lines.xml} | 0 .../components/product_screen/product_screen.js} | 0 .../static/src/{js => overrides/models}/pos_mercury.js | 0 .../Screens/BillScreen.js => app/bill_screen/bill_screen.js} | 0 .../Screens/BillScreen.xml => app/bill_screen/bill_screen.xml} | 0 .../orderline_note_button/orderline_note_button.js} | 0 .../orderline_note_button/orderline_note_button.xml} | 0 .../control_buttons/print_bill_button/print_bill_button.js} | 0 .../control_buttons/print_bill_button/print_bill_button.xml} | 0 .../control_buttons/split_bill_button/split_bill_button.js} | 0 .../control_buttons/split_bill_button/split_bill_button.xml} | 0 .../control_buttons/table_guests_button/table_guests_button.js} | 0 .../table_guests_button/table_guests_button.xml} | 0 .../transfer_order_button/transfer_order_button.js} | 0 .../transfer_order_button/transfer_order_button.xml} | 0 .../split_bill_screen/split_bill_screen.js} | 0 .../split_bill_screen/split_bill_screen.xml} | 0 .../split_bill_screen/split_orderline/split_orderline.js} | 0 .../split_bill_screen/split_orderline/split_orderline.xml} | 0 .../src/{xml/TipReceipt.xml => app/tip_receipt/tip_receipt.xml} | 0 .../{js/Screens/TipScreen.js => app/tip_screen/tip_screen.js} | 0 .../Screens/TipScreen.xml => app/tip_screen/tip_screen.xml} | 0 .../components/navbar/back_button/back_button.js} | 0 .../static/src/{app => overrides/components}/navbar/navbar.js | 0 .../static/src/{app => overrides/components}/navbar/navbar.xml | 0 .../components/payment_screen/payment_screen.js} | 0 .../components/payment_screen/payment_screen.xml} | 0 .../payment_screen_payment_lines.xml} | 0 .../product_screen/actionpad_widget/actionpad_widget.js} | 0 .../product_screen/actionpad_widget/actionpad_widget.xml} | 0 .../components/product_screen/orderline/orderline.xml} | 0 .../components/product_screen/product_screen.js} | 0 .../components/product_screen/product_screen.xml} | 0 .../components/receipt_screen/order_receipt/order_receipt.xml} | 0 .../components/receipt_screen/receipt_screen.js} | 0 .../components/ticket_screen/ticket_screen.js} | 0 .../components/ticket_screen/ticket_screen.xml} | 0 .../static/src/{js => overrides/models}/models.js | 0 .../static/src/{js => overrides/models}/payment.js | 0 .../static/src/{app/popup => overrides/models}/popup_service.js | 0 .../static/src/{app => overrides/models}/pos_bus.js | 0 .../static/src/{app => overrides/models}/pos_store.js | 0 .../static/src/{js => overrides/models}/payment_adyen.js | 0 .../static/src/{js => overrides/models}/payment_stripe.js | 0 .../sale_order_fetcher/sale_order_fetcher.js} | 0 .../order_management_screen/sale_order_list/sale_order_list.js} | 0 .../sale_order_list/sale_order_list.xml} | 0 .../sale_order_management_control_panel.js} | 0 .../sale_order_management_control_panel.xml} | 0 .../sale_order_management_screen.js} | 0 .../sale_order_management_screen.xml} | 0 .../order_management_screen/sale_order_row/sale_order_row.js} | 0 .../order_management_screen/sale_order_row/sale_order_row.xml} | 0 .../set_sale_order_button/set_sale_order_button.js} | 0 .../set_sale_order_button/set_sale_order_button.xml} | 0 .../components/product_screen/orderline/orderline.xml} | 0 .../components/receipt_screen/order_receipt/order_receipt.xml} | 0 addons/pos_sale/static/src/{js => overrides/models}/models.js | 0 .../pos_sale/static/src/{app => overrides/models}/pos_store.js | 0 .../static/src/{js => overrides/models}/models.js | 0 .../components/product_info_button/product_info_button.js} | 0 .../components/product_info_button/product_info_button.xml} | 0 .../components/product_info_popup/product_info_popup.xml} | 0 .../BalanceButton.js => app/balance_button/balance_button.js} | 0 .../BalanceButton.xml => app/balance_button/balance_button.xml} | 0 addons/pos_six/static/src/{js => app}/payment_six.js | 0 .../static/src/{app => overrides/components/navbar}/navbar.js | 2 +- .../static/src/{app => overrides/components/navbar}/navbar.xml | 0 addons/pos_six/static/src/{js => overrides/models}/models.js | 0 addons/pos_stripe/static/src/{js => app}/payment_stripe.js | 0 addons/pos_stripe/static/src/{js => overrides/models}/models.js | 0 139 files changed, 1 insertion(+), 1 deletion(-) rename addons/l10n_ae_pos/static/src/{xml/Screens/ReceiptScreen/OrderReceipt.xml => overrides/components/order_receipt/order_receipt.xml} (100%) rename addons/l10n_co_pos/static/src/{xml/pos.xml => overrides/components/order_receipt/order_receipt.xml} (100%) rename addons/l10n_co_pos/static/src/{js/PaymentScreen.js => overrides/components/payment_screen/payment_screen.js} (100%) rename addons/l10n_co_pos/static/src/{js => overrides/models}/pos.js (100%) rename addons/l10n_gcc_pos/static/src/{js/OrderReceipt.js => overrides/components/order_receipt/order_receipt.js} (100%) rename addons/l10n_gcc_pos/static/src/{xml/OrderReceipt.xml => overrides/components/order_receipt/order_receipt.xml} (100%) rename addons/l10n_in_pos/static/src/{xml => overrides/components}/pos_receipt.xml (100%) rename addons/l10n_in_pos/static/src/{js/receipt.js => overrides/models/orderline.js} (100%) rename addons/l10n_sa_pos/static/src/{xml/OrderReceipt.xml => overrides/components/order_receipt/order_receipt.xml} (100%) rename addons/l10n_sa_pos/static/src/{js => overrides/models}/models.js (100%) rename addons/pos_adyen/static/src/{js => app}/payment_adyen.js (100%) rename addons/pos_adyen/static/src/{js/PaymentScreen.js => overrides/components/payment_screen/payment_screen.js} (100%) rename addons/pos_adyen/static/src/{js => overrides/models}/models.js (100%) rename addons/pos_discount/static/src/{js/DiscountButton.js => overrides/components/discount_button/discount_button.js} (100%) rename addons/pos_discount/static/src/{xml/DiscountButton.xml => overrides/components/discount_button/discount_button.xml} (100%) rename addons/pos_discount/static/src/{js => overrides/models}/models.js (100%) rename addons/pos_epson_printer/static/src/{xml => app/components}/epos_templates.xml (100%) rename addons/pos_epson_printer/static/src/{js => app}/epson_printer.js (100%) rename addons/pos_epson_printer/static/src/{js => overrides/models}/models.js (100%) rename addons/pos_hr/static/src/{js/HeaderLockButton.js => app/header_lock_button/header_lock_button.js} (100%) rename addons/pos_hr/static/src/{xml/HeaderLockButton.xml => app/header_lock_button/header_lock_button.xml} (100%) rename addons/pos_hr/static/src/{js/LoginScreen.js => app/login_screen/login_screen.js} (100%) rename addons/pos_hr/static/src/{xml/LoginScreen.xml => app/login_screen/login_screen.xml} (100%) rename addons/pos_hr/static/src/{js/SelectCashierMixin.js => app/select_cashier_mixin.js} (100%) rename addons/pos_hr/static/src/{js/CashierName.js => overrides/components/cashier_name/cashier_name.js} (100%) rename addons/pos_hr/static/src/{xml/CashierName.xml => overrides/components/cashier_name/cashier_name.xml} (100%) rename addons/pos_hr/static/src/{app => overrides/components/navbar}/navbar.js (100%) rename addons/pos_hr/static/src/{app => overrides/components/navbar}/navbar.xml (100%) rename addons/pos_hr/static/src/{js/PaymentScreen.js => overrides/components/payment_screen/payment_screen.js} (100%) rename addons/pos_hr/static/src/{js => overrides/models}/Chrome.js (100%) rename addons/pos_hr/static/src/{js => overrides/models}/models.js (100%) rename addons/pos_hr/static/src/{app => overrides/models}/pos_store.js (100%) rename addons/pos_hr_restaurant/static/src/{app => overrides/models}/pos_store.js (100%) rename addons/pos_loyalty/static/src/{js/ControlButtons/eWalletButton.js => app/control_buttons/e_wallet_button/e_wallet_button.js} (100%) rename addons/pos_loyalty/static/src/{xml/ControlButtons/eWalletButton.xml => app/control_buttons/e_wallet_button/e_wallet_button.xml} (100%) rename addons/pos_loyalty/static/src/{js/ControlButtons/PromoCodeButton.js => app/control_buttons/promo_code_button/promo_code_button.js} (100%) rename addons/pos_loyalty/static/src/{xml/ControlButtons/PromoCodeButton.xml => app/control_buttons/promo_code_button/promo_code_button.xml} (100%) rename addons/pos_loyalty/static/src/{js/ControlButtons/ResetProgramsButton.js => app/control_buttons/reset_programs_button/reset_programs_button.js} (100%) rename addons/pos_loyalty/static/src/{xml/ControlButtons/ResetProgramsButton.xml => app/control_buttons/reset_programs_button/reset_programs_button.xml} (100%) rename addons/pos_loyalty/static/src/{js/ControlButtons/RewardButton.js => app/control_buttons/reward_button/reward_button.js} (100%) rename addons/pos_loyalty/static/src/{xml/ControlButtons/RewardButton.xml => app/control_buttons/reward_button/reward_button.xml} (100%) rename addons/pos_loyalty/static/src/{xml/OrderReceipt.xml => overrides/components/order_receipt/order_receipt.xml} (100%) rename addons/pos_loyalty/static/src/{js/OrderSummary.js => overrides/components/order_summary/order_summary.js} (100%) rename addons/pos_loyalty/static/src/{xml/OrderSummary.xml => overrides/components/order_summary/order_summary.xml} (100%) rename addons/pos_loyalty/static/src/{js/Orderline.js => overrides/components/orderline/orderline.js} (100%) rename addons/pos_loyalty/static/src/{xml/Orderline.xml => overrides/components/orderline/orderline.xml} (100%) rename addons/pos_loyalty/static/src/{js/PartnerLine.js => overrides/components/partner_line/partner_line.js} (100%) rename addons/pos_loyalty/static/src/{xml/PartnerLine.xml => overrides/components/partner_line/partner_line.xml} (100%) rename addons/pos_loyalty/static/src/{js/PartnerListScreen.js => overrides/components/partner_list_screen/partner_list_screen.js} (100%) rename addons/pos_loyalty/static/src/{js/PaymentScreen.js => overrides/components/payment_screen/payment_screen.js} (100%) rename addons/pos_loyalty/static/src/{js/ProductScreen.js => overrides/components/product_screen/product_screen.js} (100%) rename addons/pos_loyalty/static/src/{js/TicketScreen.js => overrides/components/ticket_screen/ticket_screen.js} (100%) rename addons/pos_loyalty/static/src/{js/Loyalty.js => overrides/models/loyalty.js} (100%) rename addons/pos_loyalty/static/src/{app => overrides/models}/pos_store.js (100%) rename addons/pos_loyalty/static/{src => tests}/tours/EWalletProgramTours.js (100%) rename addons/pos_loyalty/static/{src => tests}/tours/GiftCardProgramTours.js (100%) rename addons/pos_loyalty/static/{src => tests}/tours/MultipleGiftWalletProgramsTour.js (100%) rename addons/pos_loyalty/static/{src => tests}/tours/PosLoyaltyLoyaltyProgramTour.js (100%) rename addons/pos_loyalty/static/{src => tests}/tours/PosLoyaltyRewardButtonTour.js (100%) rename addons/pos_loyalty/static/{src => tests}/tours/PosLoyaltyTour.js (100%) rename addons/pos_loyalty/static/{src => tests}/tours/PosLoyaltyTourMethods.js (100%) rename addons/pos_loyalty/static/{src => tests}/tours/PosLoyaltyValidityTour.js (100%) rename addons/pos_mercury/static/src/{js/PaymentTransactionPopup.js => app/payment_transaction_popup/payment_transaction_popup.js} (100%) rename addons/pos_mercury/static/src/{xml/PaymentTransactionPopup.xml => app/payment_transaction_popup/payment_transaction_popup.xml} (100%) rename addons/pos_mercury/static/src/{js/OrderReceipt.js => overrides/components/order_receipt/order_receipt.js} (100%) rename addons/pos_mercury/static/src/{xml/OrderReceipt.xml => overrides/components/order_receipt/order_receipt.xml} (100%) rename addons/pos_mercury/static/src/{js/PaymentScreen.js => overrides/components/payment_screen/payment_screen.js} (100%) rename addons/pos_mercury/static/src/{js/PaymentScreenPaymentLines.js => overrides/components/payment_screen_payment_lines/payment_screen_payment_lines.js} (100%) rename addons/pos_mercury/static/src/{xml/PaymentScreenPaymentLines.xml => overrides/components/payment_screen_payment_lines/payment_screen_payment_lines.xml} (100%) rename addons/pos_mercury/static/src/{js/ProductScreen.js => overrides/components/product_screen/product_screen.js} (100%) rename addons/pos_mercury/static/src/{js => overrides/models}/pos_mercury.js (100%) rename addons/pos_restaurant/static/src/{js/Screens/BillScreen.js => app/bill_screen/bill_screen.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/BillScreen.xml => app/bill_screen/bill_screen.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/ProductScreen/ControlButtons/OrderlineNoteButton.js => app/control_buttons/orderline_note_button/orderline_note_button.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/ProductScreen/ControlButtons/OrderlineNoteButton.xml => app/control_buttons/orderline_note_button/orderline_note_button.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/ProductScreen/ControlButtons/PrintBillButton.js => app/control_buttons/print_bill_button/print_bill_button.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/ProductScreen/ControlButtons/PrintBillButton.xml => app/control_buttons/print_bill_button/print_bill_button.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/ProductScreen/ControlButtons/SplitBillButton.js => app/control_buttons/split_bill_button/split_bill_button.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/ProductScreen/ControlButtons/SplitBillButton.xml => app/control_buttons/split_bill_button/split_bill_button.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/ProductScreen/ControlButtons/TableGuestsButton.js => app/control_buttons/table_guests_button/table_guests_button.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/ProductScreen/ControlButtons/TableGuestsButton.xml => app/control_buttons/table_guests_button/table_guests_button.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/ProductScreen/ControlButtons/TransferOrderButton.js => app/control_buttons/transfer_order_button/transfer_order_button.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/ProductScreen/ControlButtons/TransferOrderButton.xml => app/control_buttons/transfer_order_button/transfer_order_button.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/SplitBillScreen/SplitBillScreen.js => app/split_bill_screen/split_bill_screen.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/SplitBillScreen/SplitBillScreen.xml => app/split_bill_screen/split_bill_screen.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/SplitBillScreen/SplitOrderline.js => app/split_bill_screen/split_orderline/split_orderline.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/SplitBillScreen/SplitOrderline.xml => app/split_bill_screen/split_orderline/split_orderline.xml} (100%) rename addons/pos_restaurant/static/src/{xml/TipReceipt.xml => app/tip_receipt/tip_receipt.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/TipScreen.js => app/tip_screen/tip_screen.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/TipScreen.xml => app/tip_screen/tip_screen.xml} (100%) rename addons/pos_restaurant/static/src/{app/navbar/BackButton.js => overrides/components/navbar/back_button/back_button.js} (100%) rename addons/pos_restaurant/static/src/{app => overrides/components}/navbar/navbar.js (100%) rename addons/pos_restaurant/static/src/{app => overrides/components}/navbar/navbar.xml (100%) rename addons/pos_restaurant/static/src/{js/Screens/PaymentScreen.js => overrides/components/payment_screen/payment_screen.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/PaymentScreen/PaymentScreen.xml => overrides/components/payment_screen/payment_screen.xml} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/PaymentScreen/PaymentScreenPaymentLines.xml => overrides/components/payment_screen/payment_screen_payment_lines/payment_screen_payment_lines.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/ProductScreen/ActionpadWidget.js => overrides/components/product_screen/actionpad_widget/actionpad_widget.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/ProductScreen/ActionpadWidget.xml => overrides/components/product_screen/actionpad_widget/actionpad_widget.xml} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/ProductScreen/Orderline.xml => overrides/components/product_screen/orderline/orderline.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/ProductScreen/ProductScreen.js => overrides/components/product_screen/product_screen.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/ProductScreen/ProductScreen.xml => overrides/components/product_screen/product_screen.xml} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/ReceiptScreen/OrderReceipt.xml => overrides/components/receipt_screen/order_receipt/order_receipt.xml} (100%) rename addons/pos_restaurant/static/src/{js/Screens/ReceiptScreen/ReceiptScreen.js => overrides/components/receipt_screen/receipt_screen.js} (100%) rename addons/pos_restaurant/static/src/{js/Screens/TicketScreen.js => overrides/components/ticket_screen/ticket_screen.js} (100%) rename addons/pos_restaurant/static/src/{xml/Screens/TicketScreen.xml => overrides/components/ticket_screen/ticket_screen.xml} (100%) rename addons/pos_restaurant/static/src/{js => overrides/models}/models.js (100%) rename addons/pos_restaurant/static/src/{js => overrides/models}/payment.js (100%) rename addons/pos_restaurant/static/src/{app/popup => overrides/models}/popup_service.js (100%) rename addons/pos_restaurant/static/src/{app => overrides/models}/pos_bus.js (100%) rename addons/pos_restaurant/static/src/{app => overrides/models}/pos_store.js (100%) rename addons/pos_restaurant_adyen/static/src/{js => overrides/models}/payment_adyen.js (100%) rename addons/pos_restaurant_stripe/static/src/{js => overrides/models}/payment_stripe.js (100%) rename addons/pos_sale/static/src/{js/OrderManagementScreen/SaleOrderFetcher.js => app/order_management_screen/sale_order_fetcher/sale_order_fetcher.js} (100%) rename addons/pos_sale/static/src/{js/OrderManagementScreen/SaleOrderList.js => app/order_management_screen/sale_order_list/sale_order_list.js} (100%) rename addons/pos_sale/static/src/{xml/OrderManagementScreen/SaleOrderList.xml => app/order_management_screen/sale_order_list/sale_order_list.xml} (100%) rename addons/pos_sale/static/src/{js/OrderManagementScreen/SaleOrderManagementControlPanel.js => app/order_management_screen/sale_order_management_control_panel/sale_order_management_control_panel.js} (100%) rename addons/pos_sale/static/src/{xml/OrderManagementScreen/SaleOrderManagementControlPanel.xml => app/order_management_screen/sale_order_management_control_panel/sale_order_management_control_panel.xml} (100%) rename addons/pos_sale/static/src/{js/OrderManagementScreen/SaleOrderManagementScreen.js => app/order_management_screen/sale_order_management_screen/sale_order_management_screen.js} (100%) rename addons/pos_sale/static/src/{xml/OrderManagementScreen/SaleOrderManagementScreen.xml => app/order_management_screen/sale_order_management_screen/sale_order_management_screen.xml} (100%) rename addons/pos_sale/static/src/{js/OrderManagementScreen/SaleOrderRow.js => app/order_management_screen/sale_order_row/sale_order_row.js} (100%) rename addons/pos_sale/static/src/{xml/OrderManagementScreen/SaleOrderRow.xml => app/order_management_screen/sale_order_row/sale_order_row.xml} (100%) rename addons/pos_sale/static/src/{js/SetSaleOrderButton.js => app/set_sale_order_button/set_sale_order_button.js} (100%) rename addons/pos_sale/static/src/{xml/SetSaleOrderButton.xml => app/set_sale_order_button/set_sale_order_button.xml} (100%) rename addons/pos_sale/static/src/{xml/ProductScreen/Orderline.xml => overrides/components/product_screen/orderline/orderline.xml} (100%) rename addons/pos_sale/static/src/{xml/ReceiptScreen/OrderReceipt.xml => overrides/components/receipt_screen/order_receipt/order_receipt.xml} (100%) rename addons/pos_sale/static/src/{js => overrides/models}/models.js (100%) rename addons/pos_sale/static/src/{app => overrides/models}/pos_store.js (100%) rename addons/pos_sale_loyalty/static/src/{js => overrides/models}/models.js (100%) rename addons/pos_sale_product_configurator/static/src/{js/Screens/ProductScreen/ControlButtons/ProductInfoButton.js => overrides/components/product_info_button/product_info_button.js} (100%) rename addons/pos_sale_product_configurator/static/src/{xml/Screens/ProductScreen/ControlButtons/ProductInfoButton.xml => overrides/components/product_info_button/product_info_button.xml} (100%) rename addons/pos_sale_product_configurator/static/src/{xml/Popups/ProductInfoPopup.xml => overrides/components/product_info_popup/product_info_popup.xml} (100%) rename addons/pos_six/static/src/{js/BalanceButton.js => app/balance_button/balance_button.js} (100%) rename addons/pos_six/static/src/{xml/BalanceButton.xml => app/balance_button/balance_button.xml} (100%) rename addons/pos_six/static/src/{js => app}/payment_six.js (100%) rename addons/pos_six/static/src/{app => overrides/components/navbar}/navbar.js (74%) rename addons/pos_six/static/src/{app => overrides/components/navbar}/navbar.xml (100%) rename addons/pos_six/static/src/{js => overrides/models}/models.js (100%) rename addons/pos_stripe/static/src/{js => app}/payment_stripe.js (100%) rename addons/pos_stripe/static/src/{js => overrides/models}/models.js (100%) diff --git a/addons/l10n_ae_pos/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml b/addons/l10n_ae_pos/static/src/overrides/components/order_receipt/order_receipt.xml similarity index 100% rename from addons/l10n_ae_pos/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml rename to addons/l10n_ae_pos/static/src/overrides/components/order_receipt/order_receipt.xml diff --git a/addons/l10n_co_pos/static/src/xml/pos.xml b/addons/l10n_co_pos/static/src/overrides/components/order_receipt/order_receipt.xml similarity index 100% rename from addons/l10n_co_pos/static/src/xml/pos.xml rename to addons/l10n_co_pos/static/src/overrides/components/order_receipt/order_receipt.xml diff --git a/addons/l10n_co_pos/static/src/js/PaymentScreen.js b/addons/l10n_co_pos/static/src/overrides/components/payment_screen/payment_screen.js similarity index 100% rename from addons/l10n_co_pos/static/src/js/PaymentScreen.js rename to addons/l10n_co_pos/static/src/overrides/components/payment_screen/payment_screen.js diff --git a/addons/l10n_co_pos/static/src/js/pos.js b/addons/l10n_co_pos/static/src/overrides/models/pos.js similarity index 100% rename from addons/l10n_co_pos/static/src/js/pos.js rename to addons/l10n_co_pos/static/src/overrides/models/pos.js diff --git a/addons/l10n_gcc_pos/static/src/js/OrderReceipt.js b/addons/l10n_gcc_pos/static/src/overrides/components/order_receipt/order_receipt.js similarity index 100% rename from addons/l10n_gcc_pos/static/src/js/OrderReceipt.js rename to addons/l10n_gcc_pos/static/src/overrides/components/order_receipt/order_receipt.js diff --git a/addons/l10n_gcc_pos/static/src/xml/OrderReceipt.xml b/addons/l10n_gcc_pos/static/src/overrides/components/order_receipt/order_receipt.xml similarity index 100% rename from addons/l10n_gcc_pos/static/src/xml/OrderReceipt.xml rename to addons/l10n_gcc_pos/static/src/overrides/components/order_receipt/order_receipt.xml diff --git a/addons/l10n_in_pos/static/src/xml/pos_receipt.xml b/addons/l10n_in_pos/static/src/overrides/components/pos_receipt.xml similarity index 100% rename from addons/l10n_in_pos/static/src/xml/pos_receipt.xml rename to addons/l10n_in_pos/static/src/overrides/components/pos_receipt.xml diff --git a/addons/l10n_in_pos/static/src/js/receipt.js b/addons/l10n_in_pos/static/src/overrides/models/orderline.js similarity index 100% rename from addons/l10n_in_pos/static/src/js/receipt.js rename to addons/l10n_in_pos/static/src/overrides/models/orderline.js diff --git a/addons/l10n_sa_pos/static/src/xml/OrderReceipt.xml b/addons/l10n_sa_pos/static/src/overrides/components/order_receipt/order_receipt.xml similarity index 100% rename from addons/l10n_sa_pos/static/src/xml/OrderReceipt.xml rename to addons/l10n_sa_pos/static/src/overrides/components/order_receipt/order_receipt.xml diff --git a/addons/l10n_sa_pos/static/src/js/models.js b/addons/l10n_sa_pos/static/src/overrides/models/models.js similarity index 100% rename from addons/l10n_sa_pos/static/src/js/models.js rename to addons/l10n_sa_pos/static/src/overrides/models/models.js diff --git a/addons/pos_adyen/static/src/js/payment_adyen.js b/addons/pos_adyen/static/src/app/payment_adyen.js similarity index 100% rename from addons/pos_adyen/static/src/js/payment_adyen.js rename to addons/pos_adyen/static/src/app/payment_adyen.js diff --git a/addons/pos_adyen/static/src/js/PaymentScreen.js b/addons/pos_adyen/static/src/overrides/components/payment_screen/payment_screen.js similarity index 100% rename from addons/pos_adyen/static/src/js/PaymentScreen.js rename to addons/pos_adyen/static/src/overrides/components/payment_screen/payment_screen.js diff --git a/addons/pos_adyen/static/src/js/models.js b/addons/pos_adyen/static/src/overrides/models/models.js similarity index 100% rename from addons/pos_adyen/static/src/js/models.js rename to addons/pos_adyen/static/src/overrides/models/models.js diff --git a/addons/pos_discount/static/src/js/DiscountButton.js b/addons/pos_discount/static/src/overrides/components/discount_button/discount_button.js similarity index 100% rename from addons/pos_discount/static/src/js/DiscountButton.js rename to addons/pos_discount/static/src/overrides/components/discount_button/discount_button.js diff --git a/addons/pos_discount/static/src/xml/DiscountButton.xml b/addons/pos_discount/static/src/overrides/components/discount_button/discount_button.xml similarity index 100% rename from addons/pos_discount/static/src/xml/DiscountButton.xml rename to addons/pos_discount/static/src/overrides/components/discount_button/discount_button.xml diff --git a/addons/pos_discount/static/src/js/models.js b/addons/pos_discount/static/src/overrides/models/models.js similarity index 100% rename from addons/pos_discount/static/src/js/models.js rename to addons/pos_discount/static/src/overrides/models/models.js diff --git a/addons/pos_epson_printer/static/src/xml/epos_templates.xml b/addons/pos_epson_printer/static/src/app/components/epos_templates.xml similarity index 100% rename from addons/pos_epson_printer/static/src/xml/epos_templates.xml rename to addons/pos_epson_printer/static/src/app/components/epos_templates.xml diff --git a/addons/pos_epson_printer/static/src/js/epson_printer.js b/addons/pos_epson_printer/static/src/app/epson_printer.js similarity index 100% rename from addons/pos_epson_printer/static/src/js/epson_printer.js rename to addons/pos_epson_printer/static/src/app/epson_printer.js diff --git a/addons/pos_epson_printer/static/src/js/models.js b/addons/pos_epson_printer/static/src/overrides/models/models.js similarity index 100% rename from addons/pos_epson_printer/static/src/js/models.js rename to addons/pos_epson_printer/static/src/overrides/models/models.js diff --git a/addons/pos_hr/static/src/js/HeaderLockButton.js b/addons/pos_hr/static/src/app/header_lock_button/header_lock_button.js similarity index 100% rename from addons/pos_hr/static/src/js/HeaderLockButton.js rename to addons/pos_hr/static/src/app/header_lock_button/header_lock_button.js diff --git a/addons/pos_hr/static/src/xml/HeaderLockButton.xml b/addons/pos_hr/static/src/app/header_lock_button/header_lock_button.xml similarity index 100% rename from addons/pos_hr/static/src/xml/HeaderLockButton.xml rename to addons/pos_hr/static/src/app/header_lock_button/header_lock_button.xml diff --git a/addons/pos_hr/static/src/js/LoginScreen.js b/addons/pos_hr/static/src/app/login_screen/login_screen.js similarity index 100% rename from addons/pos_hr/static/src/js/LoginScreen.js rename to addons/pos_hr/static/src/app/login_screen/login_screen.js diff --git a/addons/pos_hr/static/src/xml/LoginScreen.xml b/addons/pos_hr/static/src/app/login_screen/login_screen.xml similarity index 100% rename from addons/pos_hr/static/src/xml/LoginScreen.xml rename to addons/pos_hr/static/src/app/login_screen/login_screen.xml diff --git a/addons/pos_hr/static/src/js/SelectCashierMixin.js b/addons/pos_hr/static/src/app/select_cashier_mixin.js similarity index 100% rename from addons/pos_hr/static/src/js/SelectCashierMixin.js rename to addons/pos_hr/static/src/app/select_cashier_mixin.js diff --git a/addons/pos_hr/static/src/js/CashierName.js b/addons/pos_hr/static/src/overrides/components/cashier_name/cashier_name.js similarity index 100% rename from addons/pos_hr/static/src/js/CashierName.js rename to addons/pos_hr/static/src/overrides/components/cashier_name/cashier_name.js diff --git a/addons/pos_hr/static/src/xml/CashierName.xml b/addons/pos_hr/static/src/overrides/components/cashier_name/cashier_name.xml similarity index 100% rename from addons/pos_hr/static/src/xml/CashierName.xml rename to addons/pos_hr/static/src/overrides/components/cashier_name/cashier_name.xml diff --git a/addons/pos_hr/static/src/app/navbar.js b/addons/pos_hr/static/src/overrides/components/navbar/navbar.js similarity index 100% rename from addons/pos_hr/static/src/app/navbar.js rename to addons/pos_hr/static/src/overrides/components/navbar/navbar.js diff --git a/addons/pos_hr/static/src/app/navbar.xml b/addons/pos_hr/static/src/overrides/components/navbar/navbar.xml similarity index 100% rename from addons/pos_hr/static/src/app/navbar.xml rename to addons/pos_hr/static/src/overrides/components/navbar/navbar.xml diff --git a/addons/pos_hr/static/src/js/PaymentScreen.js b/addons/pos_hr/static/src/overrides/components/payment_screen/payment_screen.js similarity index 100% rename from addons/pos_hr/static/src/js/PaymentScreen.js rename to addons/pos_hr/static/src/overrides/components/payment_screen/payment_screen.js diff --git a/addons/pos_hr/static/src/js/Chrome.js b/addons/pos_hr/static/src/overrides/models/Chrome.js similarity index 100% rename from addons/pos_hr/static/src/js/Chrome.js rename to addons/pos_hr/static/src/overrides/models/Chrome.js diff --git a/addons/pos_hr/static/src/js/models.js b/addons/pos_hr/static/src/overrides/models/models.js similarity index 100% rename from addons/pos_hr/static/src/js/models.js rename to addons/pos_hr/static/src/overrides/models/models.js diff --git a/addons/pos_hr/static/src/app/pos_store.js b/addons/pos_hr/static/src/overrides/models/pos_store.js similarity index 100% rename from addons/pos_hr/static/src/app/pos_store.js rename to addons/pos_hr/static/src/overrides/models/pos_store.js diff --git a/addons/pos_hr_restaurant/static/src/app/pos_store.js b/addons/pos_hr_restaurant/static/src/overrides/models/pos_store.js similarity index 100% rename from addons/pos_hr_restaurant/static/src/app/pos_store.js rename to addons/pos_hr_restaurant/static/src/overrides/models/pos_store.js diff --git a/addons/pos_loyalty/static/src/js/ControlButtons/eWalletButton.js b/addons/pos_loyalty/static/src/app/control_buttons/e_wallet_button/e_wallet_button.js similarity index 100% rename from addons/pos_loyalty/static/src/js/ControlButtons/eWalletButton.js rename to addons/pos_loyalty/static/src/app/control_buttons/e_wallet_button/e_wallet_button.js diff --git a/addons/pos_loyalty/static/src/xml/ControlButtons/eWalletButton.xml b/addons/pos_loyalty/static/src/app/control_buttons/e_wallet_button/e_wallet_button.xml similarity index 100% rename from addons/pos_loyalty/static/src/xml/ControlButtons/eWalletButton.xml rename to addons/pos_loyalty/static/src/app/control_buttons/e_wallet_button/e_wallet_button.xml diff --git a/addons/pos_loyalty/static/src/js/ControlButtons/PromoCodeButton.js b/addons/pos_loyalty/static/src/app/control_buttons/promo_code_button/promo_code_button.js similarity index 100% rename from addons/pos_loyalty/static/src/js/ControlButtons/PromoCodeButton.js rename to addons/pos_loyalty/static/src/app/control_buttons/promo_code_button/promo_code_button.js diff --git a/addons/pos_loyalty/static/src/xml/ControlButtons/PromoCodeButton.xml b/addons/pos_loyalty/static/src/app/control_buttons/promo_code_button/promo_code_button.xml similarity index 100% rename from addons/pos_loyalty/static/src/xml/ControlButtons/PromoCodeButton.xml rename to addons/pos_loyalty/static/src/app/control_buttons/promo_code_button/promo_code_button.xml diff --git a/addons/pos_loyalty/static/src/js/ControlButtons/ResetProgramsButton.js b/addons/pos_loyalty/static/src/app/control_buttons/reset_programs_button/reset_programs_button.js similarity index 100% rename from addons/pos_loyalty/static/src/js/ControlButtons/ResetProgramsButton.js rename to addons/pos_loyalty/static/src/app/control_buttons/reset_programs_button/reset_programs_button.js diff --git a/addons/pos_loyalty/static/src/xml/ControlButtons/ResetProgramsButton.xml b/addons/pos_loyalty/static/src/app/control_buttons/reset_programs_button/reset_programs_button.xml similarity index 100% rename from addons/pos_loyalty/static/src/xml/ControlButtons/ResetProgramsButton.xml rename to addons/pos_loyalty/static/src/app/control_buttons/reset_programs_button/reset_programs_button.xml diff --git a/addons/pos_loyalty/static/src/js/ControlButtons/RewardButton.js b/addons/pos_loyalty/static/src/app/control_buttons/reward_button/reward_button.js similarity index 100% rename from addons/pos_loyalty/static/src/js/ControlButtons/RewardButton.js rename to addons/pos_loyalty/static/src/app/control_buttons/reward_button/reward_button.js diff --git a/addons/pos_loyalty/static/src/xml/ControlButtons/RewardButton.xml b/addons/pos_loyalty/static/src/app/control_buttons/reward_button/reward_button.xml similarity index 100% rename from addons/pos_loyalty/static/src/xml/ControlButtons/RewardButton.xml rename to addons/pos_loyalty/static/src/app/control_buttons/reward_button/reward_button.xml diff --git a/addons/pos_loyalty/static/src/xml/OrderReceipt.xml b/addons/pos_loyalty/static/src/overrides/components/order_receipt/order_receipt.xml similarity index 100% rename from addons/pos_loyalty/static/src/xml/OrderReceipt.xml rename to addons/pos_loyalty/static/src/overrides/components/order_receipt/order_receipt.xml diff --git a/addons/pos_loyalty/static/src/js/OrderSummary.js b/addons/pos_loyalty/static/src/overrides/components/order_summary/order_summary.js similarity index 100% rename from addons/pos_loyalty/static/src/js/OrderSummary.js rename to addons/pos_loyalty/static/src/overrides/components/order_summary/order_summary.js diff --git a/addons/pos_loyalty/static/src/xml/OrderSummary.xml b/addons/pos_loyalty/static/src/overrides/components/order_summary/order_summary.xml similarity index 100% rename from addons/pos_loyalty/static/src/xml/OrderSummary.xml rename to addons/pos_loyalty/static/src/overrides/components/order_summary/order_summary.xml diff --git a/addons/pos_loyalty/static/src/js/Orderline.js b/addons/pos_loyalty/static/src/overrides/components/orderline/orderline.js similarity index 100% rename from addons/pos_loyalty/static/src/js/Orderline.js rename to addons/pos_loyalty/static/src/overrides/components/orderline/orderline.js diff --git a/addons/pos_loyalty/static/src/xml/Orderline.xml b/addons/pos_loyalty/static/src/overrides/components/orderline/orderline.xml similarity index 100% rename from addons/pos_loyalty/static/src/xml/Orderline.xml rename to addons/pos_loyalty/static/src/overrides/components/orderline/orderline.xml diff --git a/addons/pos_loyalty/static/src/js/PartnerLine.js b/addons/pos_loyalty/static/src/overrides/components/partner_line/partner_line.js similarity index 100% rename from addons/pos_loyalty/static/src/js/PartnerLine.js rename to addons/pos_loyalty/static/src/overrides/components/partner_line/partner_line.js diff --git a/addons/pos_loyalty/static/src/xml/PartnerLine.xml b/addons/pos_loyalty/static/src/overrides/components/partner_line/partner_line.xml similarity index 100% rename from addons/pos_loyalty/static/src/xml/PartnerLine.xml rename to addons/pos_loyalty/static/src/overrides/components/partner_line/partner_line.xml diff --git a/addons/pos_loyalty/static/src/js/PartnerListScreen.js b/addons/pos_loyalty/static/src/overrides/components/partner_list_screen/partner_list_screen.js similarity index 100% rename from addons/pos_loyalty/static/src/js/PartnerListScreen.js rename to addons/pos_loyalty/static/src/overrides/components/partner_list_screen/partner_list_screen.js diff --git a/addons/pos_loyalty/static/src/js/PaymentScreen.js b/addons/pos_loyalty/static/src/overrides/components/payment_screen/payment_screen.js similarity index 100% rename from addons/pos_loyalty/static/src/js/PaymentScreen.js rename to addons/pos_loyalty/static/src/overrides/components/payment_screen/payment_screen.js diff --git a/addons/pos_loyalty/static/src/js/ProductScreen.js b/addons/pos_loyalty/static/src/overrides/components/product_screen/product_screen.js similarity index 100% rename from addons/pos_loyalty/static/src/js/ProductScreen.js rename to addons/pos_loyalty/static/src/overrides/components/product_screen/product_screen.js diff --git a/addons/pos_loyalty/static/src/js/TicketScreen.js b/addons/pos_loyalty/static/src/overrides/components/ticket_screen/ticket_screen.js similarity index 100% rename from addons/pos_loyalty/static/src/js/TicketScreen.js rename to addons/pos_loyalty/static/src/overrides/components/ticket_screen/ticket_screen.js diff --git a/addons/pos_loyalty/static/src/js/Loyalty.js b/addons/pos_loyalty/static/src/overrides/models/loyalty.js similarity index 100% rename from addons/pos_loyalty/static/src/js/Loyalty.js rename to addons/pos_loyalty/static/src/overrides/models/loyalty.js diff --git a/addons/pos_loyalty/static/src/app/pos_store.js b/addons/pos_loyalty/static/src/overrides/models/pos_store.js similarity index 100% rename from addons/pos_loyalty/static/src/app/pos_store.js rename to addons/pos_loyalty/static/src/overrides/models/pos_store.js diff --git a/addons/pos_loyalty/static/src/tours/EWalletProgramTours.js b/addons/pos_loyalty/static/tests/tours/EWalletProgramTours.js similarity index 100% rename from addons/pos_loyalty/static/src/tours/EWalletProgramTours.js rename to addons/pos_loyalty/static/tests/tours/EWalletProgramTours.js diff --git a/addons/pos_loyalty/static/src/tours/GiftCardProgramTours.js b/addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js similarity index 100% rename from addons/pos_loyalty/static/src/tours/GiftCardProgramTours.js rename to addons/pos_loyalty/static/tests/tours/GiftCardProgramTours.js diff --git a/addons/pos_loyalty/static/src/tours/MultipleGiftWalletProgramsTour.js b/addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js similarity index 100% rename from addons/pos_loyalty/static/src/tours/MultipleGiftWalletProgramsTour.js rename to addons/pos_loyalty/static/tests/tours/MultipleGiftWalletProgramsTour.js diff --git a/addons/pos_loyalty/static/src/tours/PosLoyaltyLoyaltyProgramTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js similarity index 100% rename from addons/pos_loyalty/static/src/tours/PosLoyaltyLoyaltyProgramTour.js rename to addons/pos_loyalty/static/tests/tours/PosLoyaltyLoyaltyProgramTour.js diff --git a/addons/pos_loyalty/static/src/tours/PosLoyaltyRewardButtonTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js similarity index 100% rename from addons/pos_loyalty/static/src/tours/PosLoyaltyRewardButtonTour.js rename to addons/pos_loyalty/static/tests/tours/PosLoyaltyRewardButtonTour.js diff --git a/addons/pos_loyalty/static/src/tours/PosLoyaltyTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js similarity index 100% rename from addons/pos_loyalty/static/src/tours/PosLoyaltyTour.js rename to addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js diff --git a/addons/pos_loyalty/static/src/tours/PosLoyaltyTourMethods.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyTourMethods.js similarity index 100% rename from addons/pos_loyalty/static/src/tours/PosLoyaltyTourMethods.js rename to addons/pos_loyalty/static/tests/tours/PosLoyaltyTourMethods.js diff --git a/addons/pos_loyalty/static/src/tours/PosLoyaltyValidityTour.js b/addons/pos_loyalty/static/tests/tours/PosLoyaltyValidityTour.js similarity index 100% rename from addons/pos_loyalty/static/src/tours/PosLoyaltyValidityTour.js rename to addons/pos_loyalty/static/tests/tours/PosLoyaltyValidityTour.js diff --git a/addons/pos_mercury/static/src/js/PaymentTransactionPopup.js b/addons/pos_mercury/static/src/app/payment_transaction_popup/payment_transaction_popup.js similarity index 100% rename from addons/pos_mercury/static/src/js/PaymentTransactionPopup.js rename to addons/pos_mercury/static/src/app/payment_transaction_popup/payment_transaction_popup.js diff --git a/addons/pos_mercury/static/src/xml/PaymentTransactionPopup.xml b/addons/pos_mercury/static/src/app/payment_transaction_popup/payment_transaction_popup.xml similarity index 100% rename from addons/pos_mercury/static/src/xml/PaymentTransactionPopup.xml rename to addons/pos_mercury/static/src/app/payment_transaction_popup/payment_transaction_popup.xml diff --git a/addons/pos_mercury/static/src/js/OrderReceipt.js b/addons/pos_mercury/static/src/overrides/components/order_receipt/order_receipt.js similarity index 100% rename from addons/pos_mercury/static/src/js/OrderReceipt.js rename to addons/pos_mercury/static/src/overrides/components/order_receipt/order_receipt.js diff --git a/addons/pos_mercury/static/src/xml/OrderReceipt.xml b/addons/pos_mercury/static/src/overrides/components/order_receipt/order_receipt.xml similarity index 100% rename from addons/pos_mercury/static/src/xml/OrderReceipt.xml rename to addons/pos_mercury/static/src/overrides/components/order_receipt/order_receipt.xml diff --git a/addons/pos_mercury/static/src/js/PaymentScreen.js b/addons/pos_mercury/static/src/overrides/components/payment_screen/payment_screen.js similarity index 100% rename from addons/pos_mercury/static/src/js/PaymentScreen.js rename to addons/pos_mercury/static/src/overrides/components/payment_screen/payment_screen.js diff --git a/addons/pos_mercury/static/src/js/PaymentScreenPaymentLines.js b/addons/pos_mercury/static/src/overrides/components/payment_screen_payment_lines/payment_screen_payment_lines.js similarity index 100% rename from addons/pos_mercury/static/src/js/PaymentScreenPaymentLines.js rename to addons/pos_mercury/static/src/overrides/components/payment_screen_payment_lines/payment_screen_payment_lines.js diff --git a/addons/pos_mercury/static/src/xml/PaymentScreenPaymentLines.xml b/addons/pos_mercury/static/src/overrides/components/payment_screen_payment_lines/payment_screen_payment_lines.xml similarity index 100% rename from addons/pos_mercury/static/src/xml/PaymentScreenPaymentLines.xml rename to addons/pos_mercury/static/src/overrides/components/payment_screen_payment_lines/payment_screen_payment_lines.xml diff --git a/addons/pos_mercury/static/src/js/ProductScreen.js b/addons/pos_mercury/static/src/overrides/components/product_screen/product_screen.js similarity index 100% rename from addons/pos_mercury/static/src/js/ProductScreen.js rename to addons/pos_mercury/static/src/overrides/components/product_screen/product_screen.js diff --git a/addons/pos_mercury/static/src/js/pos_mercury.js b/addons/pos_mercury/static/src/overrides/models/pos_mercury.js similarity index 100% rename from addons/pos_mercury/static/src/js/pos_mercury.js rename to addons/pos_mercury/static/src/overrides/models/pos_mercury.js diff --git a/addons/pos_restaurant/static/src/js/Screens/BillScreen.js b/addons/pos_restaurant/static/src/app/bill_screen/bill_screen.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/BillScreen.js rename to addons/pos_restaurant/static/src/app/bill_screen/bill_screen.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/BillScreen.xml b/addons/pos_restaurant/static/src/app/bill_screen/bill_screen.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/BillScreen.xml rename to addons/pos_restaurant/static/src/app/bill_screen/bill_screen.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/OrderlineNoteButton.js b/addons/pos_restaurant/static/src/app/control_buttons/orderline_note_button/orderline_note_button.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/OrderlineNoteButton.js rename to addons/pos_restaurant/static/src/app/control_buttons/orderline_note_button/orderline_note_button.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/OrderlineNoteButton.xml b/addons/pos_restaurant/static/src/app/control_buttons/orderline_note_button/orderline_note_button.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/OrderlineNoteButton.xml rename to addons/pos_restaurant/static/src/app/control_buttons/orderline_note_button/orderline_note_button.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/PrintBillButton.js b/addons/pos_restaurant/static/src/app/control_buttons/print_bill_button/print_bill_button.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/PrintBillButton.js rename to addons/pos_restaurant/static/src/app/control_buttons/print_bill_button/print_bill_button.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/PrintBillButton.xml b/addons/pos_restaurant/static/src/app/control_buttons/print_bill_button/print_bill_button.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/PrintBillButton.xml rename to addons/pos_restaurant/static/src/app/control_buttons/print_bill_button/print_bill_button.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/SplitBillButton.js b/addons/pos_restaurant/static/src/app/control_buttons/split_bill_button/split_bill_button.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/SplitBillButton.js rename to addons/pos_restaurant/static/src/app/control_buttons/split_bill_button/split_bill_button.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/SplitBillButton.xml b/addons/pos_restaurant/static/src/app/control_buttons/split_bill_button/split_bill_button.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/SplitBillButton.xml rename to addons/pos_restaurant/static/src/app/control_buttons/split_bill_button/split_bill_button.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/TableGuestsButton.js b/addons/pos_restaurant/static/src/app/control_buttons/table_guests_button/table_guests_button.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/TableGuestsButton.js rename to addons/pos_restaurant/static/src/app/control_buttons/table_guests_button/table_guests_button.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/TableGuestsButton.xml b/addons/pos_restaurant/static/src/app/control_buttons/table_guests_button/table_guests_button.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/TableGuestsButton.xml rename to addons/pos_restaurant/static/src/app/control_buttons/table_guests_button/table_guests_button.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/TransferOrderButton.js b/addons/pos_restaurant/static/src/app/control_buttons/transfer_order_button/transfer_order_button.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/ProductScreen/ControlButtons/TransferOrderButton.js rename to addons/pos_restaurant/static/src/app/control_buttons/transfer_order_button/transfer_order_button.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/TransferOrderButton.xml b/addons/pos_restaurant/static/src/app/control_buttons/transfer_order_button/transfer_order_button.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ControlButtons/TransferOrderButton.xml rename to addons/pos_restaurant/static/src/app/control_buttons/transfer_order_button/transfer_order_button.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitBillScreen.js b/addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitBillScreen.js rename to addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/SplitBillScreen/SplitBillScreen.xml b/addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/SplitBillScreen/SplitBillScreen.xml rename to addons/pos_restaurant/static/src/app/split_bill_screen/split_bill_screen.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitOrderline.js b/addons/pos_restaurant/static/src/app/split_bill_screen/split_orderline/split_orderline.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/SplitBillScreen/SplitOrderline.js rename to addons/pos_restaurant/static/src/app/split_bill_screen/split_orderline/split_orderline.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/SplitBillScreen/SplitOrderline.xml b/addons/pos_restaurant/static/src/app/split_bill_screen/split_orderline/split_orderline.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/SplitBillScreen/SplitOrderline.xml rename to addons/pos_restaurant/static/src/app/split_bill_screen/split_orderline/split_orderline.xml diff --git a/addons/pos_restaurant/static/src/xml/TipReceipt.xml b/addons/pos_restaurant/static/src/app/tip_receipt/tip_receipt.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/TipReceipt.xml rename to addons/pos_restaurant/static/src/app/tip_receipt/tip_receipt.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/TipScreen.js b/addons/pos_restaurant/static/src/app/tip_screen/tip_screen.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/TipScreen.js rename to addons/pos_restaurant/static/src/app/tip_screen/tip_screen.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/TipScreen.xml b/addons/pos_restaurant/static/src/app/tip_screen/tip_screen.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/TipScreen.xml rename to addons/pos_restaurant/static/src/app/tip_screen/tip_screen.xml diff --git a/addons/pos_restaurant/static/src/app/navbar/BackButton.js b/addons/pos_restaurant/static/src/overrides/components/navbar/back_button/back_button.js similarity index 100% rename from addons/pos_restaurant/static/src/app/navbar/BackButton.js rename to addons/pos_restaurant/static/src/overrides/components/navbar/back_button/back_button.js diff --git a/addons/pos_restaurant/static/src/app/navbar/navbar.js b/addons/pos_restaurant/static/src/overrides/components/navbar/navbar.js similarity index 100% rename from addons/pos_restaurant/static/src/app/navbar/navbar.js rename to addons/pos_restaurant/static/src/overrides/components/navbar/navbar.js diff --git a/addons/pos_restaurant/static/src/app/navbar/navbar.xml b/addons/pos_restaurant/static/src/overrides/components/navbar/navbar.xml similarity index 100% rename from addons/pos_restaurant/static/src/app/navbar/navbar.xml rename to addons/pos_restaurant/static/src/overrides/components/navbar/navbar.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/PaymentScreen.js b/addons/pos_restaurant/static/src/overrides/components/payment_screen/payment_screen.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/PaymentScreen.js rename to addons/pos_restaurant/static/src/overrides/components/payment_screen/payment_screen.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml b/addons/pos_restaurant/static/src/overrides/components/payment_screen/payment_screen.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/PaymentScreen/PaymentScreen.xml rename to addons/pos_restaurant/static/src/overrides/components/payment_screen/payment_screen.xml diff --git a/addons/pos_restaurant/static/src/xml/Screens/PaymentScreen/PaymentScreenPaymentLines.xml b/addons/pos_restaurant/static/src/overrides/components/payment_screen/payment_screen_payment_lines/payment_screen_payment_lines.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/PaymentScreen/PaymentScreenPaymentLines.xml rename to addons/pos_restaurant/static/src/overrides/components/payment_screen/payment_screen_payment_lines/payment_screen_payment_lines.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/ProductScreen/ActionpadWidget.js b/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/ProductScreen/ActionpadWidget.js rename to addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml b/addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ActionpadWidget.xml rename to addons/pos_restaurant/static/src/overrides/components/product_screen/actionpad_widget/actionpad_widget.xml diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/Orderline.xml b/addons/pos_restaurant/static/src/overrides/components/product_screen/orderline/orderline.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/ProductScreen/Orderline.xml rename to addons/pos_restaurant/static/src/overrides/components/product_screen/orderline/orderline.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/ProductScreen/ProductScreen.js b/addons/pos_restaurant/static/src/overrides/components/product_screen/product_screen.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/ProductScreen/ProductScreen.js rename to addons/pos_restaurant/static/src/overrides/components/product_screen/product_screen.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ProductScreen.xml b/addons/pos_restaurant/static/src/overrides/components/product_screen/product_screen.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/ProductScreen/ProductScreen.xml rename to addons/pos_restaurant/static/src/overrides/components/product_screen/product_screen.xml diff --git a/addons/pos_restaurant/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml b/addons/pos_restaurant/static/src/overrides/components/receipt_screen/order_receipt/order_receipt.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml rename to addons/pos_restaurant/static/src/overrides/components/receipt_screen/order_receipt/order_receipt.xml diff --git a/addons/pos_restaurant/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js b/addons/pos_restaurant/static/src/overrides/components/receipt_screen/receipt_screen.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/ReceiptScreen/ReceiptScreen.js rename to addons/pos_restaurant/static/src/overrides/components/receipt_screen/receipt_screen.js diff --git a/addons/pos_restaurant/static/src/js/Screens/TicketScreen.js b/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.js similarity index 100% rename from addons/pos_restaurant/static/src/js/Screens/TicketScreen.js rename to addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.js diff --git a/addons/pos_restaurant/static/src/xml/Screens/TicketScreen.xml b/addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.xml similarity index 100% rename from addons/pos_restaurant/static/src/xml/Screens/TicketScreen.xml rename to addons/pos_restaurant/static/src/overrides/components/ticket_screen/ticket_screen.xml diff --git a/addons/pos_restaurant/static/src/js/models.js b/addons/pos_restaurant/static/src/overrides/models/models.js similarity index 100% rename from addons/pos_restaurant/static/src/js/models.js rename to addons/pos_restaurant/static/src/overrides/models/models.js diff --git a/addons/pos_restaurant/static/src/js/payment.js b/addons/pos_restaurant/static/src/overrides/models/payment.js similarity index 100% rename from addons/pos_restaurant/static/src/js/payment.js rename to addons/pos_restaurant/static/src/overrides/models/payment.js diff --git a/addons/pos_restaurant/static/src/app/popup/popup_service.js b/addons/pos_restaurant/static/src/overrides/models/popup_service.js similarity index 100% rename from addons/pos_restaurant/static/src/app/popup/popup_service.js rename to addons/pos_restaurant/static/src/overrides/models/popup_service.js diff --git a/addons/pos_restaurant/static/src/app/pos_bus.js b/addons/pos_restaurant/static/src/overrides/models/pos_bus.js similarity index 100% rename from addons/pos_restaurant/static/src/app/pos_bus.js rename to addons/pos_restaurant/static/src/overrides/models/pos_bus.js diff --git a/addons/pos_restaurant/static/src/app/pos_store.js b/addons/pos_restaurant/static/src/overrides/models/pos_store.js similarity index 100% rename from addons/pos_restaurant/static/src/app/pos_store.js rename to addons/pos_restaurant/static/src/overrides/models/pos_store.js diff --git a/addons/pos_restaurant_adyen/static/src/js/payment_adyen.js b/addons/pos_restaurant_adyen/static/src/overrides/models/payment_adyen.js similarity index 100% rename from addons/pos_restaurant_adyen/static/src/js/payment_adyen.js rename to addons/pos_restaurant_adyen/static/src/overrides/models/payment_adyen.js diff --git a/addons/pos_restaurant_stripe/static/src/js/payment_stripe.js b/addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js similarity index 100% rename from addons/pos_restaurant_stripe/static/src/js/payment_stripe.js rename to addons/pos_restaurant_stripe/static/src/overrides/models/payment_stripe.js diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderFetcher.js b/addons/pos_sale/static/src/app/order_management_screen/sale_order_fetcher/sale_order_fetcher.js similarity index 100% rename from addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderFetcher.js rename to addons/pos_sale/static/src/app/order_management_screen/sale_order_fetcher/sale_order_fetcher.js diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderList.js b/addons/pos_sale/static/src/app/order_management_screen/sale_order_list/sale_order_list.js similarity index 100% rename from addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderList.js rename to addons/pos_sale/static/src/app/order_management_screen/sale_order_list/sale_order_list.js diff --git a/addons/pos_sale/static/src/xml/OrderManagementScreen/SaleOrderList.xml b/addons/pos_sale/static/src/app/order_management_screen/sale_order_list/sale_order_list.xml similarity index 100% rename from addons/pos_sale/static/src/xml/OrderManagementScreen/SaleOrderList.xml rename to addons/pos_sale/static/src/app/order_management_screen/sale_order_list/sale_order_list.xml diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementControlPanel.js b/addons/pos_sale/static/src/app/order_management_screen/sale_order_management_control_panel/sale_order_management_control_panel.js similarity index 100% rename from addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementControlPanel.js rename to addons/pos_sale/static/src/app/order_management_screen/sale_order_management_control_panel/sale_order_management_control_panel.js diff --git a/addons/pos_sale/static/src/xml/OrderManagementScreen/SaleOrderManagementControlPanel.xml b/addons/pos_sale/static/src/app/order_management_screen/sale_order_management_control_panel/sale_order_management_control_panel.xml similarity index 100% rename from addons/pos_sale/static/src/xml/OrderManagementScreen/SaleOrderManagementControlPanel.xml rename to addons/pos_sale/static/src/app/order_management_screen/sale_order_management_control_panel/sale_order_management_control_panel.xml diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementScreen.js b/addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.js similarity index 100% rename from addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderManagementScreen.js rename to addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.js diff --git a/addons/pos_sale/static/src/xml/OrderManagementScreen/SaleOrderManagementScreen.xml b/addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.xml similarity index 100% rename from addons/pos_sale/static/src/xml/OrderManagementScreen/SaleOrderManagementScreen.xml rename to addons/pos_sale/static/src/app/order_management_screen/sale_order_management_screen/sale_order_management_screen.xml diff --git a/addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderRow.js b/addons/pos_sale/static/src/app/order_management_screen/sale_order_row/sale_order_row.js similarity index 100% rename from addons/pos_sale/static/src/js/OrderManagementScreen/SaleOrderRow.js rename to addons/pos_sale/static/src/app/order_management_screen/sale_order_row/sale_order_row.js diff --git a/addons/pos_sale/static/src/xml/OrderManagementScreen/SaleOrderRow.xml b/addons/pos_sale/static/src/app/order_management_screen/sale_order_row/sale_order_row.xml similarity index 100% rename from addons/pos_sale/static/src/xml/OrderManagementScreen/SaleOrderRow.xml rename to addons/pos_sale/static/src/app/order_management_screen/sale_order_row/sale_order_row.xml diff --git a/addons/pos_sale/static/src/js/SetSaleOrderButton.js b/addons/pos_sale/static/src/app/set_sale_order_button/set_sale_order_button.js similarity index 100% rename from addons/pos_sale/static/src/js/SetSaleOrderButton.js rename to addons/pos_sale/static/src/app/set_sale_order_button/set_sale_order_button.js diff --git a/addons/pos_sale/static/src/xml/SetSaleOrderButton.xml b/addons/pos_sale/static/src/app/set_sale_order_button/set_sale_order_button.xml similarity index 100% rename from addons/pos_sale/static/src/xml/SetSaleOrderButton.xml rename to addons/pos_sale/static/src/app/set_sale_order_button/set_sale_order_button.xml diff --git a/addons/pos_sale/static/src/xml/ProductScreen/Orderline.xml b/addons/pos_sale/static/src/overrides/components/product_screen/orderline/orderline.xml similarity index 100% rename from addons/pos_sale/static/src/xml/ProductScreen/Orderline.xml rename to addons/pos_sale/static/src/overrides/components/product_screen/orderline/orderline.xml diff --git a/addons/pos_sale/static/src/xml/ReceiptScreen/OrderReceipt.xml b/addons/pos_sale/static/src/overrides/components/receipt_screen/order_receipt/order_receipt.xml similarity index 100% rename from addons/pos_sale/static/src/xml/ReceiptScreen/OrderReceipt.xml rename to addons/pos_sale/static/src/overrides/components/receipt_screen/order_receipt/order_receipt.xml diff --git a/addons/pos_sale/static/src/js/models.js b/addons/pos_sale/static/src/overrides/models/models.js similarity index 100% rename from addons/pos_sale/static/src/js/models.js rename to addons/pos_sale/static/src/overrides/models/models.js diff --git a/addons/pos_sale/static/src/app/pos_store.js b/addons/pos_sale/static/src/overrides/models/pos_store.js similarity index 100% rename from addons/pos_sale/static/src/app/pos_store.js rename to addons/pos_sale/static/src/overrides/models/pos_store.js diff --git a/addons/pos_sale_loyalty/static/src/js/models.js b/addons/pos_sale_loyalty/static/src/overrides/models/models.js similarity index 100% rename from addons/pos_sale_loyalty/static/src/js/models.js rename to addons/pos_sale_loyalty/static/src/overrides/models/models.js diff --git a/addons/pos_sale_product_configurator/static/src/js/Screens/ProductScreen/ControlButtons/ProductInfoButton.js b/addons/pos_sale_product_configurator/static/src/overrides/components/product_info_button/product_info_button.js similarity index 100% rename from addons/pos_sale_product_configurator/static/src/js/Screens/ProductScreen/ControlButtons/ProductInfoButton.js rename to addons/pos_sale_product_configurator/static/src/overrides/components/product_info_button/product_info_button.js diff --git a/addons/pos_sale_product_configurator/static/src/xml/Screens/ProductScreen/ControlButtons/ProductInfoButton.xml b/addons/pos_sale_product_configurator/static/src/overrides/components/product_info_button/product_info_button.xml similarity index 100% rename from addons/pos_sale_product_configurator/static/src/xml/Screens/ProductScreen/ControlButtons/ProductInfoButton.xml rename to addons/pos_sale_product_configurator/static/src/overrides/components/product_info_button/product_info_button.xml diff --git a/addons/pos_sale_product_configurator/static/src/xml/Popups/ProductInfoPopup.xml b/addons/pos_sale_product_configurator/static/src/overrides/components/product_info_popup/product_info_popup.xml similarity index 100% rename from addons/pos_sale_product_configurator/static/src/xml/Popups/ProductInfoPopup.xml rename to addons/pos_sale_product_configurator/static/src/overrides/components/product_info_popup/product_info_popup.xml diff --git a/addons/pos_six/static/src/js/BalanceButton.js b/addons/pos_six/static/src/app/balance_button/balance_button.js similarity index 100% rename from addons/pos_six/static/src/js/BalanceButton.js rename to addons/pos_six/static/src/app/balance_button/balance_button.js diff --git a/addons/pos_six/static/src/xml/BalanceButton.xml b/addons/pos_six/static/src/app/balance_button/balance_button.xml similarity index 100% rename from addons/pos_six/static/src/xml/BalanceButton.xml rename to addons/pos_six/static/src/app/balance_button/balance_button.xml diff --git a/addons/pos_six/static/src/js/payment_six.js b/addons/pos_six/static/src/app/payment_six.js similarity index 100% rename from addons/pos_six/static/src/js/payment_six.js rename to addons/pos_six/static/src/app/payment_six.js diff --git a/addons/pos_six/static/src/app/navbar.js b/addons/pos_six/static/src/overrides/components/navbar/navbar.js similarity index 74% rename from addons/pos_six/static/src/app/navbar.js rename to addons/pos_six/static/src/overrides/components/navbar/navbar.js index ce17d94441a..2c04e45e7e7 100644 --- a/addons/pos_six/static/src/app/navbar.js +++ b/addons/pos_six/static/src/overrides/components/navbar/navbar.js @@ -1,7 +1,7 @@ /** @odoo-module */ import { Navbar } from "@point_of_sale/app/navbar/navbar"; -import { BalanceButton } from "@pos_six/js/BalanceButton"; +import { BalanceButton } from "@pos_six/app/balance_button/balance_button"; import { patch } from "@web/core/utils/patch"; patch(Navbar, "pos_six.Navbar", { diff --git a/addons/pos_six/static/src/app/navbar.xml b/addons/pos_six/static/src/overrides/components/navbar/navbar.xml similarity index 100% rename from addons/pos_six/static/src/app/navbar.xml rename to addons/pos_six/static/src/overrides/components/navbar/navbar.xml diff --git a/addons/pos_six/static/src/js/models.js b/addons/pos_six/static/src/overrides/models/models.js similarity index 100% rename from addons/pos_six/static/src/js/models.js rename to addons/pos_six/static/src/overrides/models/models.js diff --git a/addons/pos_stripe/static/src/js/payment_stripe.js b/addons/pos_stripe/static/src/app/payment_stripe.js similarity index 100% rename from addons/pos_stripe/static/src/js/payment_stripe.js rename to addons/pos_stripe/static/src/app/payment_stripe.js diff --git a/addons/pos_stripe/static/src/js/models.js b/addons/pos_stripe/static/src/overrides/models/models.js similarity index 100% rename from addons/pos_stripe/static/src/js/models.js rename to addons/pos_stripe/static/src/overrides/models/models.js From 83b45b3be9082927279f662fad44980abf6a7e69 Mon Sep 17 00:00:00 2001 From: vlst Date: Tue, 4 Jul 2023 08:59:00 +0000 Subject: [PATCH 2/2] [REF] pos*: adapt imports pos*: l10n_ae_pos,l10n_co_pos,l10n_fr_pos_cert,l10n_gcc_pos, l10n_in_pos,l10n_sa_pos,pos_adyen,pos_discount, pos_epson_printer,pos_hr,pos_hr_restaurant,pos_loyalty, pos_mercury,pos_restaurant,pos_restaurant_adyen,pos_restaurant_stripe, pos_sale,pos_sale_loyalty,pos_sale_product_configurator,pos_six, pos_stripe In the previous commit, we moved and renamed files such that they better follow certain guidelines. In this commit, we adapt imports accordingly. In order to efficiently accomplish this task, i used the following [script](https://github.com/vlst-odoo/tools/blob/main/fixImports.py) Task: 3394192 Part-of: odoo/odoo#127056 --- addons/l10n_ae_pos/__manifest__.py | 2 +- addons/l10n_co_pos/__manifest__.py | 3 +-- addons/l10n_fr_pos_cert/__manifest__.py | 4 +--- addons/l10n_gcc_pos/__manifest__.py | 4 +--- addons/l10n_in_pos/__manifest__.py | 3 +-- addons/l10n_sa_pos/__manifest__.py | 3 +-- addons/pos_adyen/static/src/overrides/models/models.js | 2 +- addons/pos_discount/__manifest__.py | 3 +-- addons/pos_epson_printer/__manifest__.py | 3 +-- .../static/src/overrides/models/models.js | 2 +- addons/pos_hr/__manifest__.py | 9 +-------- .../pos_hr/static/src/app/login_screen/login_screen.js | 2 +- .../overrides/components/cashier_name/cashier_name.js | 2 +- .../static/src/overrides/models/pos_store.js | 2 +- addons/pos_loyalty/__init__.py | 1 + addons/pos_loyalty/__manifest__.py | 7 ++----- .../components/payment_screen/payment_screen.js | 2 +- .../pos_loyalty/static/src/overrides/models/pos_store.js | 2 +- .../static/tests/tours/EWalletProgramTours.js | 2 +- .../static/tests/tours/GiftCardProgramTours.js | 2 +- .../static/tests/tours/MultipleGiftWalletProgramsTour.js | 2 +- .../static/tests/tours/PosLoyaltyLoyaltyProgramTour.js | 2 +- .../static/tests/tours/PosLoyaltyRewardButtonTour.js | 2 +- addons/pos_loyalty/static/tests/tours/PosLoyaltyTour.js | 2 +- .../static/tests/tours/PosLoyaltyValidityTour.js | 2 +- addons/pos_mercury/__manifest__.py | 9 +-------- .../components/payment_screen/payment_screen.js | 2 +- addons/pos_restaurant/__manifest__.py | 4 +--- .../src/app/split_bill_screen/split_bill_screen.js | 2 +- .../components/navbar/back_button/back_button.js | 2 +- .../static/src/overrides/models/pos_store.js | 2 +- .../static/src/overrides/models/payment_adyen.js | 2 +- .../static/src/overrides/models/payment_stripe.js | 2 +- .../sale_order_list/sale_order_list.js | 2 +- .../sale_order_management_screen.js | 4 ++-- addons/pos_sale_loyalty/__manifest__.py | 2 +- addons/pos_sale_product_configurator/__manifest__.py | 4 +--- addons/pos_six/__manifest__.py | 6 +----- addons/pos_six/static/src/overrides/models/models.js | 2 +- addons/pos_stripe/static/src/overrides/models/models.js | 2 +- 40 files changed, 42 insertions(+), 75 deletions(-) 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);