From 6d786f1b4773e1cd11ccef5cb91050faa11f5ce4 Mon Sep 17 00:00:00 2001 From: Joseph Caburnay Date: Mon, 5 Jun 2023 14:03:57 +0000 Subject: [PATCH] [FIX] barcodes_gs1_nomenclature,point_of_sale: pos should load gs1 After https://github.com/odoo/odoo/pull/120070, pos is no longer loading the assets of `barcodes_gs1_nomenclature`. We should, however, load them because pos is dependent on the said addon thru `stock`. And since pos no longer loads the legacy `web.core` module, we also need to adapt the barcode_parser.js override to use a more modern module in importing `_lt`. closes odoo/odoo#123977 X-original-commit: 00c5a3171bceed6f84e76ca4819d20d0ef61bcc1 Signed-off-by: Heinz Robin (rhe) Signed-off-by: Joseph Caburnay (jcb) --- .../barcodes_gs1_nomenclature/static/src/js/barcode_parser.js | 2 +- addons/point_of_sale/__manifest__.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/barcodes_gs1_nomenclature/static/src/js/barcode_parser.js b/addons/barcodes_gs1_nomenclature/static/src/js/barcode_parser.js index 9c8e28f8a6e..b727813e495 100644 --- a/addons/barcodes_gs1_nomenclature/static/src/js/barcode_parser.js +++ b/addons/barcodes_gs1_nomenclature/static/src/js/barcode_parser.js @@ -2,7 +2,7 @@ import { patch } from "@web/core/utils/patch"; import { BarcodeParser } from "@barcodes/js/barcode_parser"; -import {_lt} from "web.core"; +import { _lt } from "@web/core/l10n/translation"; export const FNC1_CHAR = String.fromCharCode(29); diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py index e9d8d3b7c60..16c015c5a2e 100644 --- a/addons/point_of_sale/__manifest__.py +++ b/addons/point_of_sale/__manifest__.py @@ -98,6 +98,8 @@ # barcode scanner 'barcodes/static/src/barcode_service.js', 'barcodes/static/src/js/barcode_parser.js', + 'barcodes_gs1_nomenclature/static/src/js/barcode_parser.js', + 'barcodes_gs1_nomenclature/static/src/js/barcode_service.js', 'web/static/src/legacy/js/core/class.js', 'web/static/src/views/fields/parsers.js', 'web/static/src/webclient/barcode/barcode_scanner.js',