From ada641aab0d084e59b27ebe3a34300c03eb26942 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Wed, 18 Nov 2026 15:02:01 +0100 Subject: [PATCH 01/12] [IMP] barcode_scanner: Use specific assets & move elements in a more OWL way --- barcode_scanner/__manifest__.py | 24 +++------ .../assets_backend/barcode_scanner_app.esm.js | 49 +++++++++++++++++++ .../src/{js => components/app}/app.esm.js | 10 ++-- .../app/app.scss} | 0 .../static/src/components/app/app.xml | 18 +++++++ .../main_screen}/main_screen.esm.js | 4 +- .../main_screen/main_screen.xml} | 16 ------ .../src/{js => }/hooks/use_barcode.esm.js | 0 .../hooks/use_barcode_dispatcher.esm.js | 4 +- .../{js => }/hooks/use_barcode_handler.esm.js | 2 +- .../src/{js => }/hooks/use_inventory.esm.js | 0 .../static/src/{js => }/registries.esm.js | 0 .../api_service.esm.js} | 0 .../barcode_service.esm.js} | 2 +- .../barcode_store_service.esm.js} | 0 .../{js => }/services/feedback_service.esm.js | 0 .../router_service.esm.js} | 2 +- .../src/{js => utils}/barcode_parser.esm.js | 2 +- .../src/{js => }/utils/scan_match.esm.js | 0 .../static/tests/api_error_message.test.js | 2 +- .../static/tests/feedback_service.test.js | 2 +- .../static/tests/use_barcode.test.js | 2 +- 22 files changed, 91 insertions(+), 48 deletions(-) create mode 100644 barcode_scanner/static/src/assets_backend/barcode_scanner_app.esm.js rename barcode_scanner/static/src/{js => components/app}/app.esm.js (89%) rename barcode_scanner/static/src/{scss/barcode_scanner.scss => components/app/app.scss} (100%) create mode 100644 barcode_scanner/static/src/components/app/app.xml rename barcode_scanner/static/src/{js/screens => components/main_screen}/main_screen.esm.js (91%) rename barcode_scanner/static/src/{xml/barcode_scanner_templates.xml => components/main_screen/main_screen.xml} (76%) rename barcode_scanner/static/src/{js => }/hooks/use_barcode.esm.js (100%) rename barcode_scanner/static/src/{js => }/hooks/use_barcode_dispatcher.esm.js (88%) rename barcode_scanner/static/src/{js => }/hooks/use_barcode_handler.esm.js (77%) rename barcode_scanner/static/src/{js => }/hooks/use_inventory.esm.js (100%) rename barcode_scanner/static/src/{js => }/registries.esm.js (100%) rename barcode_scanner/static/src/{js/api.esm.js => services/api_service.esm.js} (100%) rename barcode_scanner/static/src/{js/barcode.esm.js => services/barcode_service.esm.js} (99%) rename barcode_scanner/static/src/{js/store.esm.js => services/barcode_store_service.esm.js} (100%) rename barcode_scanner/static/src/{js => }/services/feedback_service.esm.js (100%) rename barcode_scanner/static/src/{js/router.esm.js => services/router_service.esm.js} (98%) rename barcode_scanner/static/src/{js => utils}/barcode_parser.esm.js (92%) rename barcode_scanner/static/src/{js => }/utils/scan_match.esm.js (100%) diff --git a/barcode_scanner/__manifest__.py b/barcode_scanner/__manifest__.py index 460b679..74d2a14 100644 --- a/barcode_scanner/__manifest__.py +++ b/barcode_scanner/__manifest__.py @@ -17,24 +17,16 @@ ], "assets": { "web.assets_backend": [ - "barcode_scanner/static/src/scss/barcode_scanner.scss", - "barcode_scanner/static/src/xml/barcode_scanner_templates.xml", - "barcode_scanner/static/src/js/registries.esm.js", - "barcode_scanner/static/src/js/barcode_parser.esm.js", - "barcode_scanner/static/src/js/utils/scan_match.esm.js", - "barcode_scanner/static/src/js/barcode.esm.js", - "barcode_scanner/static/src/js/api.esm.js", - "barcode_scanner/static/src/js/router.esm.js", - "barcode_scanner/static/src/js/store.esm.js", - "barcode_scanner/static/src/js/app.esm.js", - "barcode_scanner/static/src/js/services/feedback_service.esm.js", - "barcode_scanner/static/src/js/hooks/use_barcode.esm.js", - "barcode_scanner/static/src/js/hooks/use_barcode_handler.esm.js", - "barcode_scanner/static/src/js/hooks/use_barcode_dispatcher.esm.js", - "barcode_scanner/static/src/js/hooks/use_inventory.esm.js", - "barcode_scanner/static/src/js/screens/main_screen.esm.js", + "barcode_scanner/static/src/assets_backend/*.esm.js", + ], + "barcode_scanner.assets": [ + "barcode_scanner/static/src/**/*.esm.js", + "barcode_scanner/static/src/components/**/*.scss", + "barcode_scanner/static/src/components/**/*.xml", + ("remove", "barcode_scanner/static/src/assets_backend/*.esm.js"), ], "web.assets_unit_tests": [ + ("include", "barcode_scanner.assets"), "barcode_scanner/static/tests/**/*", ], }, diff --git a/barcode_scanner/static/src/assets_backend/barcode_scanner_app.esm.js b/barcode_scanner/static/src/assets_backend/barcode_scanner_app.esm.js new file mode 100644 index 0000000..9bfdca8 --- /dev/null +++ b/barcode_scanner/static/src/assets_backend/barcode_scanner_app.esm.js @@ -0,0 +1,49 @@ +import {_t} from "@web/core/l10n/translation"; +import {registry} from "@web/core/registry"; +import {loadBundle} from "@web/core/assets"; + +const actionRegistry = registry.category("actions"); + +/** + * Add a new function client action which loads the spreadsheet bundle, then + * launch the actual action. + * The action should be redefine in the bundle with `{ force: true }` + * and the actual action component or function + * @param {String} actionName + * @param {String} [path] + * @param {String} [displayName] + */ +export function addBarcodeActionLazyLoader(actionName, path, displayName) { + const actionLazyLoader = async (env, action) => { + // Load the bundle which should redefine the action in the registry + await loadBundle("barcode_scanner.assets"); + + if (actionRegistry.get(actionName) === actionLazyLoader) { + // At this point, the real spreadsheet client action should be loaded and have + // replaced this function in the action registry. If it's not the case, + // it probably means that there was a crash in the bundle (e.g. syntax + // error). In this case, this action will remain in the registry, which + // will lead to an infinite loop. To prevent that, we push another action + // in the registry. + actionRegistry.add( + actionName, + () => { + const msg = _t("%s couldn't be loaded", actionName); + env.services.notification.add(msg, {type: "danger"}); + }, + {force: true} + ); + } + // Then do the action again, with the actual definition registered + return action; + }; + if (path) { + actionLazyLoader.path = path; + } + if (displayName) { + actionLazyLoader.displayName = displayName; + } + actionRegistry.add(actionName, actionLazyLoader); +} + +addBarcodeActionLazyLoader("barcode_scanner_app"); diff --git a/barcode_scanner/static/src/js/app.esm.js b/barcode_scanner/static/src/components/app/app.esm.js similarity index 89% rename from barcode_scanner/static/src/js/app.esm.js rename to barcode_scanner/static/src/components/app/app.esm.js index 2a4467b..0956486 100644 --- a/barcode_scanner/static/src/js/app.esm.js +++ b/barcode_scanner/static/src/components/app/app.esm.js @@ -2,13 +2,11 @@ import {Component, onMounted, onWillStart, onWillUnmount, useState} from "@odoo/ import {registry} from "@web/core/registry"; import {useService} from "@web/core/utils/hooks"; -import "@barcode_scanner/js/services/feedback_service.esm"; - import { barcodeAppWidgets, barcodeScreens, barcodeStartupTasks, -} from "@barcode_scanner/js/registries.esm"; +} from "../../registries.esm"; export class BarcodeScannerApp extends Component { setup() { @@ -19,7 +17,7 @@ export class BarcodeScannerApp extends Component { if (!this.router.currentRoute) { this.router.navigate("main"); } - onWillStart(() => this.runStartupTasks()); + onWillStart(async () => this.runStartupTasks()); // Capture scans (incl. Android IME/soft-input PDAs) only while the app // is open, so it never steals focus on the rest of the back office. onMounted(() => this.barcode.activate()); @@ -63,4 +61,6 @@ export class BarcodeScannerApp extends Component { BarcodeScannerApp.template = "barcode_scanner.App"; -registry.category("actions").add("barcode_scanner_app", BarcodeScannerApp); +registry + .category("actions") + .add("barcode_scanner_app", BarcodeScannerApp, {force: true}); diff --git a/barcode_scanner/static/src/scss/barcode_scanner.scss b/barcode_scanner/static/src/components/app/app.scss similarity index 100% rename from barcode_scanner/static/src/scss/barcode_scanner.scss rename to barcode_scanner/static/src/components/app/app.scss diff --git a/barcode_scanner/static/src/components/app/app.xml b/barcode_scanner/static/src/components/app/app.xml new file mode 100644 index 0000000..60580fd --- /dev/null +++ b/barcode_scanner/static/src/components/app/app.xml @@ -0,0 +1,18 @@ + + + +
+ + + +
+ + + +
+
+ diff --git a/barcode_scanner/static/src/js/screens/main_screen.esm.js b/barcode_scanner/static/src/components/main_screen/main_screen.esm.js similarity index 91% rename from barcode_scanner/static/src/js/screens/main_screen.esm.js rename to barcode_scanner/static/src/components/main_screen/main_screen.esm.js index db6f555..ebe229f 100644 --- a/barcode_scanner/static/src/js/screens/main_screen.esm.js +++ b/barcode_scanner/static/src/components/main_screen/main_screen.esm.js @@ -3,8 +3,8 @@ import {_t} from "@web/core/l10n/translation"; import {useService} from "@web/core/utils/hooks"; import {user} from "@web/core/user"; import {imageUrl} from "@web/core/utils/urls"; -import {useBarcodeDispatcher} from "@barcode_scanner/js/hooks/use_barcode_dispatcher.esm"; -import {barcodeMenuTiles, barcodeScreens} from "@barcode_scanner/js/registries.esm"; +import {useBarcodeDispatcher} from "../../hooks/use_barcode_dispatcher.esm"; +import {barcodeMenuTiles, barcodeScreens} from "../../registries.esm"; export class MainScreen extends Component { setup() { diff --git a/barcode_scanner/static/src/xml/barcode_scanner_templates.xml b/barcode_scanner/static/src/components/main_screen/main_screen.xml similarity index 76% rename from barcode_scanner/static/src/xml/barcode_scanner_templates.xml rename to barcode_scanner/static/src/components/main_screen/main_screen.xml index b4d09db..3e09864 100644 --- a/barcode_scanner/static/src/xml/barcode_scanner_templates.xml +++ b/barcode_scanner/static/src/components/main_screen/main_screen.xml @@ -1,21 +1,5 @@ - -
- - - -
- - - -
-
-
diff --git a/barcode_scanner/static/src/js/hooks/use_barcode.esm.js b/barcode_scanner/static/src/hooks/use_barcode.esm.js similarity index 100% rename from barcode_scanner/static/src/js/hooks/use_barcode.esm.js rename to barcode_scanner/static/src/hooks/use_barcode.esm.js diff --git a/barcode_scanner/static/src/js/hooks/use_barcode_dispatcher.esm.js b/barcode_scanner/static/src/hooks/use_barcode_dispatcher.esm.js similarity index 88% rename from barcode_scanner/static/src/js/hooks/use_barcode_dispatcher.esm.js rename to barcode_scanner/static/src/hooks/use_barcode_dispatcher.esm.js index a145bef..ffaf5ab 100644 --- a/barcode_scanner/static/src/js/hooks/use_barcode_dispatcher.esm.js +++ b/barcode_scanner/static/src/hooks/use_barcode_dispatcher.esm.js @@ -1,8 +1,8 @@ import {useEnv} from "@odoo/owl"; import {_t} from "@web/core/l10n/translation"; import {useService} from "@web/core/utils/hooks"; -import {useBarcodeHandler} from "@barcode_scanner/js/hooks/use_barcode_handler.esm"; -import {barcodeScanHandlers} from "@barcode_scanner/js/registries.esm"; +import {useBarcodeHandler} from "./use_barcode_handler.esm"; +import {barcodeScanHandlers} from "../registries.esm"; /** * Runs a scanned barcode through the registered scan handlers, in `sequence` diff --git a/barcode_scanner/static/src/js/hooks/use_barcode_handler.esm.js b/barcode_scanner/static/src/hooks/use_barcode_handler.esm.js similarity index 77% rename from barcode_scanner/static/src/js/hooks/use_barcode_handler.esm.js rename to barcode_scanner/static/src/hooks/use_barcode_handler.esm.js index 58dfca2..0bb637c 100644 --- a/barcode_scanner/static/src/js/hooks/use_barcode_handler.esm.js +++ b/barcode_scanner/static/src/hooks/use_barcode_handler.esm.js @@ -1,4 +1,4 @@ -import {useBarcode} from "@barcode_scanner/js/hooks/use_barcode.esm"; +import {useBarcode} from "./use_barcode.esm"; export function useBarcodeHandler({onScan}) { useBarcode((ev) => { diff --git a/barcode_scanner/static/src/js/hooks/use_inventory.esm.js b/barcode_scanner/static/src/hooks/use_inventory.esm.js similarity index 100% rename from barcode_scanner/static/src/js/hooks/use_inventory.esm.js rename to barcode_scanner/static/src/hooks/use_inventory.esm.js diff --git a/barcode_scanner/static/src/js/registries.esm.js b/barcode_scanner/static/src/registries.esm.js similarity index 100% rename from barcode_scanner/static/src/js/registries.esm.js rename to barcode_scanner/static/src/registries.esm.js diff --git a/barcode_scanner/static/src/js/api.esm.js b/barcode_scanner/static/src/services/api_service.esm.js similarity index 100% rename from barcode_scanner/static/src/js/api.esm.js rename to barcode_scanner/static/src/services/api_service.esm.js diff --git a/barcode_scanner/static/src/js/barcode.esm.js b/barcode_scanner/static/src/services/barcode_service.esm.js similarity index 99% rename from barcode_scanner/static/src/js/barcode.esm.js rename to barcode_scanner/static/src/services/barcode_service.esm.js index 02c9b76..3d68499 100644 --- a/barcode_scanner/static/src/js/barcode.esm.js +++ b/barcode_scanner/static/src/services/barcode_service.esm.js @@ -1,7 +1,7 @@ import {EventBus, reactive} from "@odoo/owl"; import {registry} from "@web/core/registry"; import {session} from "@web/session"; -import {parseBarcode} from "@barcode_scanner/js/barcode_parser.esm"; +import {parseBarcode} from "../utils/barcode_parser.esm"; /** * Barcode capture for the scanning SPA, built for the Munbyn Android PDAs used diff --git a/barcode_scanner/static/src/js/store.esm.js b/barcode_scanner/static/src/services/barcode_store_service.esm.js similarity index 100% rename from barcode_scanner/static/src/js/store.esm.js rename to barcode_scanner/static/src/services/barcode_store_service.esm.js diff --git a/barcode_scanner/static/src/js/services/feedback_service.esm.js b/barcode_scanner/static/src/services/feedback_service.esm.js similarity index 100% rename from barcode_scanner/static/src/js/services/feedback_service.esm.js rename to barcode_scanner/static/src/services/feedback_service.esm.js diff --git a/barcode_scanner/static/src/js/router.esm.js b/barcode_scanner/static/src/services/router_service.esm.js similarity index 98% rename from barcode_scanner/static/src/js/router.esm.js rename to barcode_scanner/static/src/services/router_service.esm.js index e0dac3d..2601504 100644 --- a/barcode_scanner/static/src/js/router.esm.js +++ b/barcode_scanner/static/src/services/router_service.esm.js @@ -1,7 +1,7 @@ import {Reactive} from "@web/core/utils/reactive"; import {browser} from "@web/core/browser/browser"; import {registry} from "@web/core/registry"; -import {barcodeScreens} from "@barcode_scanner/js/registries.esm"; +import {barcodeScreens} from "../registries.esm"; const HISTORY_LIMIT = 50; diff --git a/barcode_scanner/static/src/js/barcode_parser.esm.js b/barcode_scanner/static/src/utils/barcode_parser.esm.js similarity index 92% rename from barcode_scanner/static/src/js/barcode_parser.esm.js rename to barcode_scanner/static/src/utils/barcode_parser.esm.js index 765a081..5bdcbbc 100644 --- a/barcode_scanner/static/src/js/barcode_parser.esm.js +++ b/barcode_scanner/static/src/utils/barcode_parser.esm.js @@ -1,4 +1,4 @@ -import {barcodeParsers} from "@barcode_scanner/js/registries.esm"; +import {barcodeParsers} from "../registries.esm"; /** * Built-in EAN13 parser. Registered last (high sequence) so it acts as the diff --git a/barcode_scanner/static/src/js/utils/scan_match.esm.js b/barcode_scanner/static/src/utils/scan_match.esm.js similarity index 100% rename from barcode_scanner/static/src/js/utils/scan_match.esm.js rename to barcode_scanner/static/src/utils/scan_match.esm.js diff --git a/barcode_scanner/static/tests/api_error_message.test.js b/barcode_scanner/static/tests/api_error_message.test.js index 4bf9e6f..4550c27 100644 --- a/barcode_scanner/static/tests/api_error_message.test.js +++ b/barcode_scanner/static/tests/api_error_message.test.js @@ -1,7 +1,7 @@ /** @odoo-module **/ import {describe, expect, test} from "@odoo/hoot"; -import {errorMessage} from "@barcode_scanner/js/api.esm"; +import {errorMessage} from "@barcode_scanner/services/api_service.esm"; describe("BarcodeScanner", () => { test("shows the server message for user-facing exceptions", () => { diff --git a/barcode_scanner/static/tests/feedback_service.test.js b/barcode_scanner/static/tests/feedback_service.test.js index 0923842..3e06eb8 100644 --- a/barcode_scanner/static/tests/feedback_service.test.js +++ b/barcode_scanner/static/tests/feedback_service.test.js @@ -1,5 +1,5 @@ import {describe, expect, test} from "@odoo/hoot"; -import {BarcodeScannerFeedbackService} from "@barcode_scanner/js/services/feedback_service.esm"; +import {BarcodeScannerFeedbackService} from "@barcode_scanner/services/feedback_service.esm"; function makeFeedback(notifications) { const feedback = new BarcodeScannerFeedbackService({ diff --git a/barcode_scanner/static/tests/use_barcode.test.js b/barcode_scanner/static/tests/use_barcode.test.js index a968865..a99bb11 100644 --- a/barcode_scanner/static/tests/use_barcode.test.js +++ b/barcode_scanner/static/tests/use_barcode.test.js @@ -2,7 +2,7 @@ import {Component, useState, xml} from "@odoo/owl"; import {describe, expect, test} from "@odoo/hoot"; import {getService, mountWithCleanup} from "@web/../tests/web_test_helpers"; import {animationFrame} from "@odoo/hoot-dom"; -import {useBarcode} from "@barcode_scanner/js/hooks/use_barcode.esm"; +import {useBarcode} from "@barcode_scanner/hooks/use_barcode.esm"; class Reader extends Component { static template = xml`
`; From c00812cf658167d9e8364a6f3a91da5c439f6639 Mon Sep 17 00:00:00 2001 From: Enric Tobella Date: Wed, 18 Nov 2026 15:50:59 +0100 Subject: [PATCH 02/12] [IMP] barcode_stock: split files and distribute them properly --- barcode_stock/__manifest__.py | 29 +- .../image_viewer}/image_viewer.esm.js | 0 .../image_viewer/warehouse_ops_screen.xml | 32 + .../internal_transfer_screen.esm.js | 10 +- .../internal_transfer_screen.xml | 192 ++ .../location_selector_screen.esm.js | 8 +- .../location_selector_screen.xml | 94 + .../move_wizard_screen.esm.js | 8 +- .../move_wizard_screen/move_wizard_screen.xml | 226 ++ .../picking_done_card.esm.js | 0 .../picking_done_card/picking_done_card.xml | 62 + .../picking_done_list.esm.js | 2 +- .../picking_done_list/picking_done_list.xml | 33 + .../picking_info_tab}/picking_info_tab.esm.js | 0 .../picking_info_tab/picking_info_tab.xml | 104 + .../picking_list_screen.esm.js | 8 +- .../picking_list_screen.scss | 201 ++ .../picking_list_screen.xml | 363 +++ .../picking_move_card.esm.js | 2 +- .../picking_move_card/picking_move_card.xml | 99 + .../picking_move_list.esm.js | 6 +- .../picking_move_list/picking_move_list.xml | 34 + .../picking_screen}/picking_screen.esm.js | 18 +- .../picking_screen/picking_screen.xml | 136 ++ .../product_selector_screen.esm.js | 10 +- .../product_selector_screen.xml | 128 + .../quick_info_screen.esm.js} | 10 +- .../quick_info_screen/quick_info_screen.xml | 425 ++++ .../user_selector_screen.esm.js | 8 +- .../user_selector_screen.xml | 97 + .../warehouse_ops_screen.esm.js} | 4 +- .../warehouse_ops_screen.xml | 98 + .../handlers/stock_scan_handlers.esm.js | 4 +- .../static/src/scss/picking_filters.scss | 200 -- .../services/barcode_scanner_state.esm.js | 4 +- .../services/barcode_scanner_sync.esm.js | 0 .../{js => }/tiles/stock_menu_tiles.esm.js | 2 +- .../static/src/{js => }/utils/avatar.esm.js | 0 .../src/{js => }/utils/move_progress.esm.js | 0 .../static/src/{js => }/utils/quantity.esm.js | 0 .../src/xml/barcode_stock_templates.xml | 2095 ----------------- .../static/tests/group_order.test.js | 2 +- .../static/tests/move_line_locations.test.js | 8 +- .../static/tests/move_progress.test.js | 2 +- .../static/tests/move_wizard_lot.test.js | 6 +- .../static/tests/picking_list_groups.test.js | 2 +- .../static/tests/picking_note.test.js | 2 +- barcode_stock/static/tests/quantity.test.js | 12 +- .../static/tests/scanned_quantity.test.js | 2 +- .../static/tests/scanner_state_access.test.js | 2 +- 50 files changed, 2399 insertions(+), 2391 deletions(-) rename barcode_stock/static/src/{js/components => components/image_viewer}/image_viewer.esm.js (100%) create mode 100644 barcode_stock/static/src/components/image_viewer/warehouse_ops_screen.xml rename barcode_stock/static/src/{js/screens => components/internal_transfer_screen}/internal_transfer_screen.esm.js (98%) create mode 100644 barcode_stock/static/src/components/internal_transfer_screen/internal_transfer_screen.xml rename barcode_stock/static/src/{js/screens => components/location_selector_screen}/location_selector_screen.esm.js (91%) create mode 100644 barcode_stock/static/src/components/location_selector_screen/location_selector_screen.xml rename barcode_stock/static/src/{js/screens => components/move_wizard_screen}/move_wizard_screen.esm.js (99%) create mode 100644 barcode_stock/static/src/components/move_wizard_screen/move_wizard_screen.xml rename barcode_stock/static/src/{js/components => components/picking_done_card}/picking_done_card.esm.js (100%) create mode 100644 barcode_stock/static/src/components/picking_done_card/picking_done_card.xml rename barcode_stock/static/src/{js/components => components/picking_done_list}/picking_done_list.esm.js (85%) create mode 100644 barcode_stock/static/src/components/picking_done_list/picking_done_list.xml rename barcode_stock/static/src/{js/components => components/picking_info_tab}/picking_info_tab.esm.js (100%) create mode 100644 barcode_stock/static/src/components/picking_info_tab/picking_info_tab.xml rename barcode_stock/static/src/{js/screens => components/picking_list_screen}/picking_list_screen.esm.js (99%) create mode 100644 barcode_stock/static/src/components/picking_list_screen/picking_list_screen.scss create mode 100644 barcode_stock/static/src/components/picking_list_screen/picking_list_screen.xml rename barcode_stock/static/src/{js/components => components/picking_move_card}/picking_move_card.esm.js (96%) create mode 100644 barcode_stock/static/src/components/picking_move_card/picking_move_card.xml rename barcode_stock/static/src/{js/components => components/picking_move_list}/picking_move_list.esm.js (83%) create mode 100644 barcode_stock/static/src/components/picking_move_list/picking_move_list.xml rename barcode_stock/static/src/{js/screens => components/picking_screen}/picking_screen.esm.js (97%) create mode 100644 barcode_stock/static/src/components/picking_screen/picking_screen.xml rename barcode_stock/static/src/{js/screens => components/product_selector_screen}/product_selector_screen.esm.js (93%) create mode 100644 barcode_stock/static/src/components/product_selector_screen/product_selector_screen.xml rename barcode_stock/static/src/{js/screens/quick_info.esm.js => components/quick_info_screen/quick_info_screen.esm.js} (96%) create mode 100644 barcode_stock/static/src/components/quick_info_screen/quick_info_screen.xml rename barcode_stock/static/src/{js/screens => components/user_selector_screen}/user_selector_screen.esm.js (91%) create mode 100644 barcode_stock/static/src/components/user_selector_screen/user_selector_screen.xml rename barcode_stock/static/src/{js/screens/warehouse_ops.esm.js => components/warehouse_ops_screen/warehouse_ops_screen.esm.js} (97%) create mode 100644 barcode_stock/static/src/components/warehouse_ops_screen/warehouse_ops_screen.xml rename barcode_stock/static/src/{js => }/handlers/stock_scan_handlers.esm.js (94%) delete mode 100644 barcode_stock/static/src/scss/picking_filters.scss rename barcode_stock/static/src/{js => }/services/barcode_scanner_state.esm.js (99%) rename barcode_stock/static/src/{js => }/services/barcode_scanner_sync.esm.js (100%) rename barcode_stock/static/src/{js => }/tiles/stock_menu_tiles.esm.js (92%) rename barcode_stock/static/src/{js => }/utils/avatar.esm.js (100%) rename barcode_stock/static/src/{js => }/utils/move_progress.esm.js (100%) rename barcode_stock/static/src/{js => }/utils/quantity.esm.js (100%) delete mode 100644 barcode_stock/static/src/xml/barcode_stock_templates.xml diff --git a/barcode_stock/__manifest__.py b/barcode_stock/__manifest__.py index 8ca8606..9357351 100644 --- a/barcode_stock/__manifest__.py +++ b/barcode_stock/__manifest__.py @@ -18,31 +18,10 @@ "views/stock_location_views.xml", ], "assets": { - "web.assets_backend": [ - "barcode_stock/static/src/scss/picking_filters.scss", - "barcode_stock/static/src/xml/barcode_stock_templates.xml", - "barcode_stock/static/src/js/utils/move_progress.esm.js", - "barcode_stock/static/src/js/utils/quantity.esm.js", - "barcode_stock/static/src/js/utils/avatar.esm.js", - "barcode_stock/static/src/js/services/barcode_scanner_state.esm.js", - "barcode_stock/static/src/js/services/barcode_scanner_sync.esm.js", - "barcode_stock/static/src/js/components/picking_move_card.esm.js", - "barcode_stock/static/src/js/components/picking_move_list.esm.js", - "barcode_stock/static/src/js/components/picking_done_card.esm.js", - "barcode_stock/static/src/js/components/picking_done_list.esm.js", - "barcode_stock/static/src/js/components/image_viewer.esm.js", - "barcode_stock/static/src/js/components/picking_info_tab.esm.js", - "barcode_stock/static/src/js/screens/warehouse_ops.esm.js", - "barcode_stock/static/src/js/screens/picking_list_screen.esm.js", - "barcode_stock/static/src/js/screens/picking_screen.esm.js", - "barcode_stock/static/src/js/screens/move_wizard_screen.esm.js", - "barcode_stock/static/src/js/screens/internal_transfer_screen.esm.js", - "barcode_stock/static/src/js/screens/location_selector_screen.esm.js", - "barcode_stock/static/src/js/screens/product_selector_screen.esm.js", - "barcode_stock/static/src/js/screens/user_selector_screen.esm.js", - "barcode_stock/static/src/js/screens/quick_info.esm.js", - "barcode_stock/static/src/js/handlers/stock_scan_handlers.esm.js", - "barcode_stock/static/src/js/tiles/stock_menu_tiles.esm.js", + "barcode_scanner.assets": [ + "barcode_stock/static/src/**/*.esm.js", + "barcode_stock/static/src/**/*.xml", + "barcode_stock/static/src/**/*.scss", ], "web.assets_unit_tests": [ "barcode_stock/static/tests/**/*", diff --git a/barcode_stock/static/src/js/components/image_viewer.esm.js b/barcode_stock/static/src/components/image_viewer/image_viewer.esm.js similarity index 100% rename from barcode_stock/static/src/js/components/image_viewer.esm.js rename to barcode_stock/static/src/components/image_viewer/image_viewer.esm.js diff --git a/barcode_stock/static/src/components/image_viewer/warehouse_ops_screen.xml b/barcode_stock/static/src/components/image_viewer/warehouse_ops_screen.xml new file mode 100644 index 0000000..e723316 --- /dev/null +++ b/barcode_stock/static/src/components/image_viewer/warehouse_ops_screen.xml @@ -0,0 +1,32 @@ + + + +
+
+ + + + + Picking attachment + + +
+
+
+
diff --git a/barcode_stock/static/src/js/screens/internal_transfer_screen.esm.js b/barcode_stock/static/src/components/internal_transfer_screen/internal_transfer_screen.esm.js similarity index 98% rename from barcode_stock/static/src/js/screens/internal_transfer_screen.esm.js rename to barcode_stock/static/src/components/internal_transfer_screen/internal_transfer_screen.esm.js index 3e1a4be..3386730 100644 --- a/barcode_stock/static/src/js/screens/internal_transfer_screen.esm.js +++ b/barcode_stock/static/src/components/internal_transfer_screen/internal_transfer_screen.esm.js @@ -2,12 +2,12 @@ import {Component, onWillStart, onWillUpdateProps, useState} from "@odoo/owl"; import { barcodeMatchAnyDomain, barcodeMatchDomain, -} from "@barcode_scanner/js/utils/scan_match.esm"; +} from "@barcode_scanner/utils/scan_match.esm"; import {_t} from "@web/core/l10n/translation"; -import {barcodeScreens} from "@barcode_scanner/js/registries.esm"; -import {roundQty} from "@barcode_stock/js/utils/quantity.esm"; -import {useBarcodeHandler} from "@barcode_scanner/js/hooks/use_barcode_handler.esm"; -import {useBarcodeScanner} from "@barcode_scanner/js/hooks/use_inventory.esm"; +import {barcodeScreens} from "@barcode_scanner/registries.esm"; +import {roundQty} from "../../utils/quantity.esm"; +import {useBarcodeHandler} from "@barcode_scanner/hooks/use_barcode_handler.esm"; +import {useBarcodeScanner} from "@barcode_scanner/hooks/use_inventory.esm"; import {useService} from "@web/core/utils/hooks"; export class InternalTransferScreen extends Component { diff --git a/barcode_stock/static/src/components/internal_transfer_screen/internal_transfer_screen.xml b/barcode_stock/static/src/components/internal_transfer_screen/internal_transfer_screen.xml new file mode 100644 index 0000000..e949728 --- /dev/null +++ b/barcode_stock/static/src/components/internal_transfer_screen/internal_transfer_screen.xml @@ -0,0 +1,192 @@ + + + +
+
+ +

Internal Transfer

+
+
+ +
+
+
ORIGIN LOCATION
+
+
+ +
+
+ + + + Select origin +
+
+ +
+
+
+ +
+
DESTINATION LOCATION
+
+
+