From 1dcc4aa7aaa6eebac5ff34f4354c42d53e42593c Mon Sep 17 00:00:00 2001 From: Camille Morand Date: Tue, 25 Mar 2025 17:41:58 +0700 Subject: [PATCH 01/10] [ADD] pos_barcode_rule_priced_with_change_rate --- .../__init__.py | 1 + .../__manifest__.py | 21 +++++++++ .../i18n/fr.po | 47 +++++++++++++++++++ ...s_barcode_rule_priced_with_change_rate.pot | 47 +++++++++++++++++++ .../models/__init__.py | 3 ++ .../models/barcode_rule.py | 10 ++++ .../models/pos_config.py | 10 ++++ .../models/res_config_settings.py | 10 ++++ .../pyproject.toml | 3 ++ .../readme/CONTRIBUTORS.md | 2 + .../readme/CREDITS.md | 2 + .../readme/DESCRIPTION.md | 1 + .../product_screen/product_screen.esm.js | 42 +++++++++++++++++ .../views/res_config_settings_views.xml | 16 +++++++ 14 files changed, 215 insertions(+) create mode 100644 pos_barcode_rule_priced_with_change_rate/__init__.py create mode 100644 pos_barcode_rule_priced_with_change_rate/__manifest__.py create mode 100644 pos_barcode_rule_priced_with_change_rate/i18n/fr.po create mode 100644 pos_barcode_rule_priced_with_change_rate/i18n/pos_barcode_rule_priced_with_change_rate.pot create mode 100644 pos_barcode_rule_priced_with_change_rate/models/__init__.py create mode 100644 pos_barcode_rule_priced_with_change_rate/models/barcode_rule.py create mode 100644 pos_barcode_rule_priced_with_change_rate/models/pos_config.py create mode 100644 pos_barcode_rule_priced_with_change_rate/models/res_config_settings.py create mode 100644 pos_barcode_rule_priced_with_change_rate/pyproject.toml create mode 100644 pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md create mode 100644 pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md create mode 100644 pos_barcode_rule_priced_with_change_rate/readme/DESCRIPTION.md create mode 100644 pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js create mode 100644 pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml diff --git a/pos_barcode_rule_priced_with_change_rate/__init__.py b/pos_barcode_rule_priced_with_change_rate/__init__.py new file mode 100644 index 0000000000..0650744f6b --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/pos_barcode_rule_priced_with_change_rate/__manifest__.py b/pos_barcode_rule_priced_with_change_rate/__manifest__.py new file mode 100644 index 0000000000..f1bb1062b6 --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/__manifest__.py @@ -0,0 +1,21 @@ +{ + "name": "Point of Sale - New barcode rule for priced product with change rate", + "version": "17.0.1.0.0", + "category": "Sales/Point of Sale", + "summary": """ + Add a barcode rule to be able to scan a barcode with price encoded (as the + standard "Priced Product" rule), and convert the price according to a given + change rate. + """, + "author": "Odoo Community Association (OCA), Camptocamp", + "website": "https://github.com/OCA/pos", + "depends": ["point_of_sale"], + "data": ["views/res_config_settings_views.xml"], + "assets": { + "point_of_sale._assets_pos": [ + "pos_barcode_rule_priced_with_change_rate/static/src/**/*", + ], + }, + "installable": True, + "license": "AGPL-3", +} diff --git a/pos_barcode_rule_priced_with_change_rate/i18n/fr.po b/pos_barcode_rule_priced_with_change_rate/i18n/fr.po new file mode 100644 index 0000000000..296f751c07 --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/i18n/fr.po @@ -0,0 +1,47 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_barcode_rule_priced_with_change_rate +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 17.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-03-25 11:10+0000\n" +"PO-Revision-Date: 2025-03-25 11:10+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_barcode_rule +msgid "Barcode Rule" +msgstr "Règle de code-barres" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_pos_config__change_rate_barcode +#: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_res_config_settings__change_rate_barcode +msgid "Change rate for barcode nomenclature" +msgstr "Taux de change pour Nomenclature codes-barres" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_res_config_settings +msgid "Config Settings" +msgstr "Paramètres de configuration" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_pos_config +msgid "Point of Sale Configuration" +msgstr "Configuration du point de vente" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model.fields.selection,name:pos_barcode_rule_priced_with_change_rate.selection__barcode_rule__type__price_change_rate +msgid "Priced Product with Change Rate" +msgstr "Produit à prix fixe avec taux de change" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_barcode_rule__type +msgid "Type" +msgstr "" diff --git a/pos_barcode_rule_priced_with_change_rate/i18n/pos_barcode_rule_priced_with_change_rate.pot b/pos_barcode_rule_priced_with_change_rate/i18n/pos_barcode_rule_priced_with_change_rate.pot new file mode 100644 index 0000000000..b6c5a391c0 --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/i18n/pos_barcode_rule_priced_with_change_rate.pot @@ -0,0 +1,47 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_barcode_rule_priced_with_change_rate +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 17.0+e\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-03-25 11:07+0000\n" +"PO-Revision-Date: 2025-03-25 11:07+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_barcode_rule +msgid "Barcode Rule" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_pos_config__change_rate_barcode +#: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_res_config_settings__change_rate_barcode +msgid "Change rate for barcode nomenclature" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_res_config_settings +msgid "Config Settings" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_pos_config +msgid "Point of Sale Configuration" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model.fields.selection,name:pos_barcode_rule_priced_with_change_rate.selection__barcode_rule__type__price_change_rate +msgid "Priced Product with Change Rate" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_barcode_rule__type +msgid "Type" +msgstr "" diff --git a/pos_barcode_rule_priced_with_change_rate/models/__init__.py b/pos_barcode_rule_priced_with_change_rate/models/__init__.py new file mode 100644 index 0000000000..898c1f8ca0 --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/models/__init__.py @@ -0,0 +1,3 @@ +from . import barcode_rule +from . import pos_config +from . import res_config_settings diff --git a/pos_barcode_rule_priced_with_change_rate/models/barcode_rule.py b/pos_barcode_rule_priced_with_change_rate/models/barcode_rule.py new file mode 100644 index 0000000000..099ca2cb0f --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/models/barcode_rule.py @@ -0,0 +1,10 @@ +# Copyright 2024 Camptocamp SA (https://www.camptocamp.com). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models, fields + + +class BarcodeRule(models.Model): + _inherit = 'barcode.rule' + + type = fields.Selection(selection_add=[('price_change_rate', 'Priced Product with Change Rate')], ondelete={'price_change_rate': 'set default'}) diff --git a/pos_barcode_rule_priced_with_change_rate/models/pos_config.py b/pos_barcode_rule_priced_with_change_rate/models/pos_config.py new file mode 100644 index 0000000000..3cad6785c3 --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/models/pos_config.py @@ -0,0 +1,10 @@ +# Copyright 2024 Camptocamp SA (https://www.camptocamp.com). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class PosConfig(models.Model): + _inherit = 'pos.config' + + change_rate_barcode = fields.Float(string="Change rate for barcode nomenclature") diff --git a/pos_barcode_rule_priced_with_change_rate/models/res_config_settings.py b/pos_barcode_rule_priced_with_change_rate/models/res_config_settings.py new file mode 100644 index 0000000000..e44a8a0c3d --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/models/res_config_settings.py @@ -0,0 +1,10 @@ +# Copyright 2024 Camptocamp SA (https://www.camptocamp.com). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = 'res.config.settings' + + change_rate_barcode = fields.Float(related="pos_config_id.change_rate_barcode", readonly=False) diff --git a/pos_barcode_rule_priced_with_change_rate/pyproject.toml b/pos_barcode_rule_priced_with_change_rate/pyproject.toml new file mode 100644 index 0000000000..4231d0cccb --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md b/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md new file mode 100644 index 0000000000..7b7784d15b --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md @@ -0,0 +1,2 @@ +- [Camptocamp](https://www.camptocamp.com) + - Camille Morand \<\> diff --git a/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md b/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md new file mode 100644 index 0000000000..970ef2f12c --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md @@ -0,0 +1,2 @@ +The development was financially supported by Camptocamp. + diff --git a/pos_barcode_rule_priced_with_change_rate/readme/DESCRIPTION.md b/pos_barcode_rule_priced_with_change_rate/readme/DESCRIPTION.md new file mode 100644 index 0000000000..6694ddbbca --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/readme/DESCRIPTION.md @@ -0,0 +1 @@ +This module adds a barcode rule to be able to scan a barcode with price encoded (as the standard "Priced Product" rule), and convert the price according to a given change rate diff --git a/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js b/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js new file mode 100644 index 0000000000..99bd79e1c8 --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js @@ -0,0 +1,42 @@ +/** @odoo-module **/ + +import {ProductScreen} from "@point_of_sale/app/screens/product_screen/product_screen"; +import {useBarcodeReader} from "@point_of_sale/app/barcode/barcode_reader_hook"; +import {patch} from "@web/core/utils/patch"; +import {ConfirmPopup} from "@point_of_sale/app/utils/confirm_popup/confirm_popup"; +import {useService} from "@web/core/utils/hooks"; +import {ErrorBarcodePopup} from "@point_of_sale/app/barcode/error_popup/barcode_error_popup"; + +patch(ProductScreen.prototype, { + setup() { + super.setup(...arguments); + useBarcodeReader({ + price_change_rate: this._onPriceChangeRateScan, + }); + }, + + async _onPriceChangeRateScan(code) { + // Read the barcode the same way than it is done for the standard `price` type (cf. + // https://github.com/odoo/odoo/blob/17.0/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js#L257C1-L290C6), + // and convert the price according to the change rate in POS settings before returning it. + const product = await this._getProductByBarcode(code); + if (!product) { + return this.popup.add(ErrorBarcodePopup, {code: code.base_code}); + } + const options = await product.getAddProductOptions(code); + // Do not proceed on adding the product when no options is returned. + // This is consistent with clickProduct. + if (!options) { + return; + } + + Object.assign(options, { + price: code.value / this.pos.config.change_rate_barcode, + extras: { + price_type: "manual", + }, + }); + this.currentOrder.add_product(product, options); + this.numberBuffer.reset(); + }, +}); diff --git a/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml b/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml new file mode 100644 index 0000000000..bcdf92440d --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml @@ -0,0 +1,16 @@ + + + + + res.config.settings + + + +
+
+ + + + From ab93af22d474d5964ea5a5c42327bd39e70353b8 Mon Sep 17 00:00:00 2001 From: trisdoan Date: Tue, 25 Mar 2025 17:42:42 +0700 Subject: [PATCH 02/10] [IMP] pos_barcode_rule_priced_with_change_rate: pre-commit execution --- .../README.rst | 85 ++++ .../models/barcode_rule.py | 9 +- .../models/pos_config.py | 2 +- .../models/res_config_settings.py | 6 +- .../static/description/index.html | 433 ++++++++++++++++++ .../views/res_config_settings_views.xml | 9 +- 6 files changed, 533 insertions(+), 11 deletions(-) create mode 100644 pos_barcode_rule_priced_with_change_rate/README.rst create mode 100644 pos_barcode_rule_priced_with_change_rate/static/description/index.html diff --git a/pos_barcode_rule_priced_with_change_rate/README.rst b/pos_barcode_rule_priced_with_change_rate/README.rst new file mode 100644 index 0000000000..8eddea386e --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/README.rst @@ -0,0 +1,85 @@ +==================================================================== +Point of Sale - New barcode rule for priced product with change rate +==================================================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:ac77e3419d2de2d61295c1a36f96dd65e138863cde6747a64177b387aeeb88d7 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github + :target: https://github.com/OCA/pos/tree/18.0/pos_barcode_rule_priced_with_change_rate + :alt: OCA/pos +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/pos-18-0/pos-18-0-pos_barcode_rule_priced_with_change_rate + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=18.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module adds a barcode rule to be able to scan a barcode with price +encoded (as the standard "Priced Product" rule), and convert the price +according to a given change rate + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* Camptocamp + +Contributors +------------ + +- `Camptocamp `__ + + - Camille Morand + +Other credits +------------- + +The development was financially supported by Camptocamp. + +Maintainers +----------- + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/pos `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/pos_barcode_rule_priced_with_change_rate/models/barcode_rule.py b/pos_barcode_rule_priced_with_change_rate/models/barcode_rule.py index 099ca2cb0f..fc8b91be8f 100644 --- a/pos_barcode_rule_priced_with_change_rate/models/barcode_rule.py +++ b/pos_barcode_rule_priced_with_change_rate/models/barcode_rule.py @@ -1,10 +1,13 @@ # Copyright 2024 Camptocamp SA (https://www.camptocamp.com). # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from odoo import models, fields +from odoo import fields, models class BarcodeRule(models.Model): - _inherit = 'barcode.rule' + _inherit = "barcode.rule" - type = fields.Selection(selection_add=[('price_change_rate', 'Priced Product with Change Rate')], ondelete={'price_change_rate': 'set default'}) + type = fields.Selection( + selection_add=[("price_change_rate", "Priced Product with Change Rate")], + ondelete={"price_change_rate": "set default"}, + ) diff --git a/pos_barcode_rule_priced_with_change_rate/models/pos_config.py b/pos_barcode_rule_priced_with_change_rate/models/pos_config.py index 3cad6785c3..cb5a0ad9db 100644 --- a/pos_barcode_rule_priced_with_change_rate/models/pos_config.py +++ b/pos_barcode_rule_priced_with_change_rate/models/pos_config.py @@ -5,6 +5,6 @@ class PosConfig(models.Model): - _inherit = 'pos.config' + _inherit = "pos.config" change_rate_barcode = fields.Float(string="Change rate for barcode nomenclature") diff --git a/pos_barcode_rule_priced_with_change_rate/models/res_config_settings.py b/pos_barcode_rule_priced_with_change_rate/models/res_config_settings.py index e44a8a0c3d..2d14aa4ef3 100644 --- a/pos_barcode_rule_priced_with_change_rate/models/res_config_settings.py +++ b/pos_barcode_rule_priced_with_change_rate/models/res_config_settings.py @@ -5,6 +5,8 @@ class ResConfigSettings(models.TransientModel): - _inherit = 'res.config.settings' + _inherit = "res.config.settings" - change_rate_barcode = fields.Float(related="pos_config_id.change_rate_barcode", readonly=False) + change_rate_barcode = fields.Float( + related="pos_config_id.change_rate_barcode", readonly=False + ) diff --git a/pos_barcode_rule_priced_with_change_rate/static/description/index.html b/pos_barcode_rule_priced_with_change_rate/static/description/index.html new file mode 100644 index 0000000000..7903419398 --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/static/description/index.html @@ -0,0 +1,433 @@ + + + + + +Point of Sale - New barcode rule for priced product with change rate + + + +
+

Point of Sale - New barcode rule for priced product with change rate

+ + +

Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

+

This module adds a barcode rule to be able to scan a barcode with price +encoded (as the standard “Priced Product” rule), and convert the price +according to a given change rate

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us to smash it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Camptocamp
    • +
+
+
+

Contributors

+ +
+
+

Other credits

+

The development was financially supported by Camptocamp.

+
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/pos project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml b/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml index bcdf92440d..cd8fec5e30 100644 --- a/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml +++ b/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml @@ -1,14 +1,13 @@ - + - res.config.settings - +
-
From 64a4167f2c9dd0a0f081b4ffb4db2b3d3eea06e4 Mon Sep 17 00:00:00 2001 From: trisdoan Date: Tue, 25 Mar 2025 17:42:42 +0700 Subject: [PATCH 03/10] [MIG] pos_barcode_rule_priced_with_change_rate: Migration to 18.0 --- .../README.rst | 7 ++++- .../__manifest__.py | 2 +- .../readme/CONTRIBUTORS.md | 2 ++ .../readme/CREDITS.md | 2 +- .../static/description/index.html | 7 ++++- .../product_screen/product_screen.esm.js | 28 ++++++------------- 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/pos_barcode_rule_priced_with_change_rate/README.rst b/pos_barcode_rule_priced_with_change_rate/README.rst index 8eddea386e..fd3c88acaa 100644 --- a/pos_barcode_rule_priced_with_change_rate/README.rst +++ b/pos_barcode_rule_priced_with_change_rate/README.rst @@ -62,10 +62,15 @@ Contributors - Camille Morand +- Trobz + + - Tris Doan + Other credits ------------- -The development was financially supported by Camptocamp. +The development and migration of this module from 17.0 to 18.0 was +financially supported by Camptocamp. Maintainers ----------- diff --git a/pos_barcode_rule_priced_with_change_rate/__manifest__.py b/pos_barcode_rule_priced_with_change_rate/__manifest__.py index f1bb1062b6..29f275b44e 100644 --- a/pos_barcode_rule_priced_with_change_rate/__manifest__.py +++ b/pos_barcode_rule_priced_with_change_rate/__manifest__.py @@ -1,6 +1,6 @@ { "name": "Point of Sale - New barcode rule for priced product with change rate", - "version": "17.0.1.0.0", + "version": "18.0.1.0.0", "category": "Sales/Point of Sale", "summary": """ Add a barcode rule to be able to scan a barcode with price encoded (as the diff --git a/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md b/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md index 7b7784d15b..3d72481402 100644 --- a/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md +++ b/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md @@ -1,2 +1,4 @@ - [Camptocamp](https://www.camptocamp.com) - Camille Morand \<\> +- Trobz + - Tris Doan \<\> diff --git a/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md b/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md index 970ef2f12c..8e745b3fc5 100644 --- a/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md +++ b/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md @@ -1,2 +1,2 @@ -The development was financially supported by Camptocamp. +The development and migration of this module from 17.0 to 18.0 was financially supported by Camptocamp. diff --git a/pos_barcode_rule_priced_with_change_rate/static/description/index.html b/pos_barcode_rule_priced_with_change_rate/static/description/index.html index 7903419398..9cd977c82c 100644 --- a/pos_barcode_rule_priced_with_change_rate/static/description/index.html +++ b/pos_barcode_rule_priced_with_change_rate/static/description/index.html @@ -409,11 +409,16 @@

Contributors

  • Camille Morand
    • +
  • Trobz +

    • Other credits

    -

    The development was financially supported by Camptocamp.

    +

    The development and migration of this module from 17.0 to 18.0 was +financially supported by Camptocamp.

    Maintainers

    diff --git a/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js b/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js index 99bd79e1c8..565ebfec56 100644 --- a/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js +++ b/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js @@ -1,11 +1,6 @@ -/** @odoo-module **/ - import {ProductScreen} from "@point_of_sale/app/screens/product_screen/product_screen"; import {useBarcodeReader} from "@point_of_sale/app/barcode/barcode_reader_hook"; import {patch} from "@web/core/utils/patch"; -import {ConfirmPopup} from "@point_of_sale/app/utils/confirm_popup/confirm_popup"; -import {useService} from "@web/core/utils/hooks"; -import {ErrorBarcodePopup} from "@point_of_sale/app/barcode/error_popup/barcode_error_popup"; patch(ProductScreen.prototype, { setup() { @@ -16,27 +11,22 @@ patch(ProductScreen.prototype, { }, async _onPriceChangeRateScan(code) { - // Read the barcode the same way than it is done for the standard `price` type (cf. - // https://github.com/odoo/odoo/blob/17.0/addons/point_of_sale/static/src/app/screens/product_screen/product_screen.js#L257C1-L290C6), + // Read the barcode the same way than it is done for the standard `price` type // and convert the price according to the change rate in POS settings before returning it. const product = await this._getProductByBarcode(code); if (!product) { - return this.popup.add(ErrorBarcodePopup, {code: code.base_code}); - } - const options = await product.getAddProductOptions(code); - // Do not proceed on adding the product when no options is returned. - // This is consistent with clickProduct. - if (!options) { + this.barcodeReader.showNotFoundNotification(code); return; } - Object.assign(options, { - price: code.value / this.pos.config.change_rate_barcode, - extras: { - price_type: "manual", + await this.pos.addLineToCurrentOrder( + { + product_id: product, + price_unit: code.value / this.pos.config.change_rate_barcode, }, - }); - this.currentOrder.add_product(product, options); + {code}, + product.needToConfigure() + ); this.numberBuffer.reset(); }, }); From 431f8b72fdf1a631d9810cb6bb0c2f81caff2b70 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Wed, 9 Apr 2025 13:47:48 +0000 Subject: [PATCH 04/10] [UPD] Update pos_barcode_rule_priced_with_change_rate.pot --- .../i18n/pos_barcode_rule_priced_with_change_rate.pot | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pos_barcode_rule_priced_with_change_rate/i18n/pos_barcode_rule_priced_with_change_rate.pot b/pos_barcode_rule_priced_with_change_rate/i18n/pos_barcode_rule_priced_with_change_rate.pot index b6c5a391c0..c9ec319965 100644 --- a/pos_barcode_rule_priced_with_change_rate/i18n/pos_barcode_rule_priced_with_change_rate.pot +++ b/pos_barcode_rule_priced_with_change_rate/i18n/pos_barcode_rule_priced_with_change_rate.pot @@ -4,10 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 17.0+e\n" +"Project-Id-Version: Odoo Server 18.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-03-25 11:07+0000\n" -"PO-Revision-Date: 2025-03-25 11:07+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" From a5c443a364624f5bf5ba2831daaac95e16966747 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 9 Apr 2025 13:50:57 +0000 Subject: [PATCH 05/10] [BOT] post-merge updates --- .../README.rst | 10 +++++----- .../static/description/icon.png | Bin 0 -> 10254 bytes .../static/description/index.html | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 pos_barcode_rule_priced_with_change_rate/static/description/icon.png diff --git a/pos_barcode_rule_priced_with_change_rate/README.rst b/pos_barcode_rule_priced_with_change_rate/README.rst index fd3c88acaa..08dd35cdd0 100644 --- a/pos_barcode_rule_priced_with_change_rate/README.rst +++ b/pos_barcode_rule_priced_with_change_rate/README.rst @@ -7,7 +7,7 @@ Point of Sale - New barcode rule for priced product with change rate !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:ac77e3419d2de2d61295c1a36f96dd65e138863cde6747a64177b387aeeb88d7 + !! source digest: sha256:192992f062cf4d853314d5449c8b17956297013eeef789166cec6b4bfd062789 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png @@ -58,13 +58,13 @@ Authors Contributors ------------ -- `Camptocamp `__ +- `Camptocamp `__ - - Camille Morand + - Camille Morand -- Trobz +- Trobz - - Tris Doan + - Tris Doan Other credits ------------- diff --git a/pos_barcode_rule_priced_with_change_rate/static/description/icon.png b/pos_barcode_rule_priced_with_change_rate/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1dcc49c24f364e9adf0afbc6fc0bac6dbecdeb11 GIT binary patch literal 10254 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 of Sale - New barcode rule for priced product with chang !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:ac77e3419d2de2d61295c1a36f96dd65e138863cde6747a64177b387aeeb88d7 +!! source digest: sha256:192992f062cf4d853314d5449c8b17956297013eeef789166cec6b4bfd062789 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

    Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

    This module adds a barcode rule to be able to scan a barcode with price @@ -406,7 +406,7 @@

    Authors

    Contributors

    • Camptocamp
    • Trobz
        From 3c0450b4397b1e14efe67c1267d0315b5fa73584 Mon Sep 17 00:00:00 2001 From: mymage Date: Fri, 11 Apr 2025 14:17:01 +0000 Subject: [PATCH 06/10] Added translation using Weblate (Italian) --- .../i18n/it.po | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pos_barcode_rule_priced_with_change_rate/i18n/it.po diff --git a/pos_barcode_rule_priced_with_change_rate/i18n/it.po b/pos_barcode_rule_priced_with_change_rate/i18n/it.po new file mode 100644 index 0000000000..7a8bcb0c01 --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/i18n/it.po @@ -0,0 +1,46 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * pos_barcode_rule_priced_with_change_rate +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 18.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_barcode_rule +msgid "Barcode Rule" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_pos_config__change_rate_barcode +#: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_res_config_settings__change_rate_barcode +msgid "Change rate for barcode nomenclature" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_res_config_settings +msgid "Config Settings" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_pos_config +msgid "Point of Sale Configuration" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model.fields.selection,name:pos_barcode_rule_priced_with_change_rate.selection__barcode_rule__type__price_change_rate +msgid "Priced Product with Change Rate" +msgstr "" + +#. module: pos_barcode_rule_priced_with_change_rate +#: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_barcode_rule__type +msgid "Type" +msgstr "" From d6faf1af772fe09f50325b82421b24f64ed50add Mon Sep 17 00:00:00 2001 From: mymage Date: Fri, 11 Apr 2025 14:17:12 +0000 Subject: [PATCH 07/10] Translated using Weblate (Italian) Currently translated at 100.0% (6 of 6 strings) Translation: pos-18.0/pos-18.0-pos_barcode_rule_priced_with_change_rate Translate-URL: https://translation.odoo-community.org/projects/pos-18-0/pos-18-0-pos_barcode_rule_priced_with_change_rate/it/ --- .../i18n/it.po | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pos_barcode_rule_priced_with_change_rate/i18n/it.po b/pos_barcode_rule_priced_with_change_rate/i18n/it.po index 7a8bcb0c01..7eec09e077 100644 --- a/pos_barcode_rule_priced_with_change_rate/i18n/it.po +++ b/pos_barcode_rule_priced_with_change_rate/i18n/it.po @@ -6,41 +6,43 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 18.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2025-04-11 14:54+0000\n" +"Last-Translator: mymage \n" "Language-Team: none\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 5.10.4\n" #. module: pos_barcode_rule_priced_with_change_rate #: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_barcode_rule msgid "Barcode Rule" -msgstr "" +msgstr "Regola codice a barre" #. module: pos_barcode_rule_priced_with_change_rate #: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_pos_config__change_rate_barcode #: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_res_config_settings__change_rate_barcode msgid "Change rate for barcode nomenclature" -msgstr "" +msgstr "Tasso di cambio per la nomenclatura codice a barre" #. module: pos_barcode_rule_priced_with_change_rate #: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Impostazioni configurazione" #. module: pos_barcode_rule_priced_with_change_rate #: model:ir.model,name:pos_barcode_rule_priced_with_change_rate.model_pos_config msgid "Point of Sale Configuration" -msgstr "" +msgstr "Configurazione punto vendita" #. module: pos_barcode_rule_priced_with_change_rate #: model:ir.model.fields.selection,name:pos_barcode_rule_priced_with_change_rate.selection__barcode_rule__type__price_change_rate msgid "Priced Product with Change Rate" -msgstr "" +msgstr "Prodotto prezzato con tasso di cambio" #. module: pos_barcode_rule_priced_with_change_rate #: model:ir.model.fields,field_description:pos_barcode_rule_priced_with_change_rate.field_barcode_rule__type msgid "Type" -msgstr "" +msgstr "Tipo" From 11cbcb9f1856629f237296a5905b82f645e8bd27 Mon Sep 17 00:00:00 2001 From: Nirav Rathod Date: Mon, 18 May 2026 04:50:31 +0000 Subject: [PATCH 08/10] [IMP] pos_barcode_rule_priced_with_change_rate: black, isort, prettier --- .../README.rst | 16 ++++++---- .../__manifest__.py | 2 +- .../static/description/index.html | 30 +++++++++++-------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/pos_barcode_rule_priced_with_change_rate/README.rst b/pos_barcode_rule_priced_with_change_rate/README.rst index 08dd35cdd0..fb3fa76118 100644 --- a/pos_barcode_rule_priced_with_change_rate/README.rst +++ b/pos_barcode_rule_priced_with_change_rate/README.rst @@ -1,3 +1,7 @@ +.. image:: https://odoo-community.org/readme-banner-image + :target: https://odoo-community.org/get-involved?utm_source=readme + :alt: Odoo Community Association + ==================================================================== Point of Sale - New barcode rule for priced product with change rate ==================================================================== @@ -13,17 +17,17 @@ Point of Sale - New barcode rule for priced product with change rate .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status :alt: Beta -.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png +.. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fpos-lightgray.png?logo=github - :target: https://github.com/OCA/pos/tree/18.0/pos_barcode_rule_priced_with_change_rate + :target: https://github.com/OCA/pos/tree/19.0/pos_barcode_rule_priced_with_change_rate :alt: OCA/pos .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/pos-18-0/pos-18-0-pos_barcode_rule_priced_with_change_rate + :target: https://translation.odoo-community.org/projects/pos-19-0/pos-19-0-pos_barcode_rule_priced_with_change_rate :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png - :target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=18.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/pos&target_branch=19.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -43,7 +47,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -85,6 +89,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/pos `_ project on GitHub. +This module is part of the `OCA/pos `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/pos_barcode_rule_priced_with_change_rate/__manifest__.py b/pos_barcode_rule_priced_with_change_rate/__manifest__.py index 29f275b44e..bccd3d8488 100644 --- a/pos_barcode_rule_priced_with_change_rate/__manifest__.py +++ b/pos_barcode_rule_priced_with_change_rate/__manifest__.py @@ -1,6 +1,6 @@ { "name": "Point of Sale - New barcode rule for priced product with change rate", - "version": "18.0.1.0.0", + "version": "19.0.1.0.0", "category": "Sales/Point of Sale", "summary": """ Add a barcode rule to be able to scan a barcode with price encoded (as the diff --git a/pos_barcode_rule_priced_with_change_rate/static/description/index.html b/pos_barcode_rule_priced_with_change_rate/static/description/index.html index a0b45fe0b6..8d5bdece59 100644 --- a/pos_barcode_rule_priced_with_change_rate/static/description/index.html +++ b/pos_barcode_rule_priced_with_change_rate/static/description/index.html @@ -3,7 +3,7 @@ -Point of Sale - New barcode rule for priced product with change rate +README.rst -
        -

        Point of Sale - New barcode rule for priced product with change rate

        +
        + + +Odoo Community Association + +
        +

        Point of Sale - New barcode rule for priced product with change rate

        -

        Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

        +

        Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

        This module adds a barcode rule to be able to scan a barcode with price encoded (as the standard “Priced Product” rule), and convert the price according to a given change rate

        @@ -387,23 +392,23 @@

        Point of Sale - New barcode rule for priced product with chang

    -

    Bug Tracker

    +

    Bug Tracker

    Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -feedback.

    +feedback.

    Do not contact contributors directly about support or help with technical issues.

    -

    Credits

    +

    Credits

    -

    Authors

    +

    Authors

    • Camptocamp
    -

    Other credits

    +

    Other credits

    The development and migration of this module from 17.0 to 18.0 was financially supported by Camptocamp.

    -

    Maintainers

    +

    Maintainers

    This module is maintained by the OCA.

    Odoo Community Association @@ -429,10 +434,11 @@

    Maintainers

    OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

    -

    This module is part of the OCA/pos project on GitHub.

    +

    This module is part of the OCA/pos project on GitHub.

    You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

    + From f73a0a632dcf4623b71a59367467ecf8593d6a47 Mon Sep 17 00:00:00 2001 From: Nirav Rathod Date: Mon, 18 May 2026 05:14:57 +0000 Subject: [PATCH 09/10] [MIG] pos_barcode_rule_priced_with_change_rate: Migration to 19.0 --- .../README.rst | 25 ++++++++------- .../__manifest__.py | 1 + .../models/pos_config.py | 7 +++- .../readme/CONTRIBUTORS.md | 12 ++++--- .../readme/CREDITS.md | 2 -- .../readme/DESCRIPTION.md | 4 ++- .../static/description/index.html | 22 +++++++------ .../product_screen/product_screen.esm.js | 32 ++++++++++++++++--- .../static/src/tours/pos_barcode_tour.esm.js | 23 +++++++++++++ .../views/res_config_settings_views.xml | 9 +++++- 10 files changed, 103 insertions(+), 34 deletions(-) create mode 100644 pos_barcode_rule_priced_with_change_rate/static/src/tours/pos_barcode_tour.esm.js diff --git a/pos_barcode_rule_priced_with_change_rate/README.rst b/pos_barcode_rule_priced_with_change_rate/README.rst index fb3fa76118..f71787740a 100644 --- a/pos_barcode_rule_priced_with_change_rate/README.rst +++ b/pos_barcode_rule_priced_with_change_rate/README.rst @@ -11,12 +11,12 @@ Point of Sale - New barcode rule for priced product with change rate !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:192992f062cf4d853314d5449c8b17956297013eeef789166cec6b4bfd062789 + !! source digest: sha256:069fed6da59ff6b394529bafc4c3dcea82432135a03d961bc393f7b6daa2f261 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png +.. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png :target: https://odoo-community.org/page/development-status - :alt: Beta + :alt: Production/Stable .. |badge2| image:: https://img.shields.io/badge/license-AGPL--3-blue.png :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 @@ -32,9 +32,9 @@ Point of Sale - New barcode rule for priced product with change rate |badge1| |badge2| |badge3| |badge4| |badge5| -This module adds a barcode rule to be able to scan a barcode with price -encoded (as the standard "Priced Product" rule), and convert the price -according to a given change rate +This module adds a barcode rule to allow scanning barcodes with encoded +prices, similar to the standard "Priced Product" rule, while converting +the price according to a configured exchange rate. **Table of contents** @@ -62,19 +62,22 @@ Authors Contributors ------------ -- `Camptocamp `__ +- Camptocamp - - Camille Morand + - Camille Morand camille.morand@camptocamp.com - Trobz - - Tris Doan + - Tris Doan tridm@trobz.com + +- Niravrathod + + - Nirav Rathod niravrathod473@gmail.com Other credits ------------- -The development and migration of this module from 17.0 to 18.0 was -financially supported by Camptocamp. + Maintainers ----------- diff --git a/pos_barcode_rule_priced_with_change_rate/__manifest__.py b/pos_barcode_rule_priced_with_change_rate/__manifest__.py index bccd3d8488..2a8164c752 100644 --- a/pos_barcode_rule_priced_with_change_rate/__manifest__.py +++ b/pos_barcode_rule_priced_with_change_rate/__manifest__.py @@ -18,4 +18,5 @@ }, "installable": True, "license": "AGPL-3", + "development_status": "Production/Stable", } diff --git a/pos_barcode_rule_priced_with_change_rate/models/pos_config.py b/pos_barcode_rule_priced_with_change_rate/models/pos_config.py index cb5a0ad9db..c40f5b1934 100644 --- a/pos_barcode_rule_priced_with_change_rate/models/pos_config.py +++ b/pos_barcode_rule_priced_with_change_rate/models/pos_config.py @@ -7,4 +7,9 @@ class PosConfig(models.Model): _inherit = "pos.config" - change_rate_barcode = fields.Float(string="Change rate for barcode nomenclature") + change_rate_barcode = fields.Float( + string="Change rate for barcode nomenclature", + help="Conversion rate applied to the price encoded in a barcode " + "when using the 'Priced Product with Change Rate' rule. " + "The scanned price is divided by this rate.", + ) diff --git a/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md b/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md index 3d72481402..41dd5ee3f0 100644 --- a/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md +++ b/pos_barcode_rule_priced_with_change_rate/readme/CONTRIBUTORS.md @@ -1,4 +1,8 @@ -- [Camptocamp](https://www.camptocamp.com) - - Camille Morand \<\> -- Trobz - - Tris Doan \<\> +- Camptocamp + - Camille Morand + +- Trobz + - Tris Doan + +- Niravrathod + - Nirav Rathod \ No newline at end of file diff --git a/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md b/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md index 8e745b3fc5..e69de29bb2 100644 --- a/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md +++ b/pos_barcode_rule_priced_with_change_rate/readme/CREDITS.md @@ -1,2 +0,0 @@ -The development and migration of this module from 17.0 to 18.0 was financially supported by Camptocamp. - diff --git a/pos_barcode_rule_priced_with_change_rate/readme/DESCRIPTION.md b/pos_barcode_rule_priced_with_change_rate/readme/DESCRIPTION.md index 6694ddbbca..233b6e91f7 100644 --- a/pos_barcode_rule_priced_with_change_rate/readme/DESCRIPTION.md +++ b/pos_barcode_rule_priced_with_change_rate/readme/DESCRIPTION.md @@ -1 +1,3 @@ -This module adds a barcode rule to be able to scan a barcode with price encoded (as the standard "Priced Product" rule), and convert the price according to a given change rate +This module adds a barcode rule to allow scanning barcodes with encoded prices, +similar to the standard "Priced Product" rule, while converting the price +according to a configured exchange rate. diff --git a/pos_barcode_rule_priced_with_change_rate/static/description/index.html b/pos_barcode_rule_priced_with_change_rate/static/description/index.html index 8d5bdece59..185cd4f408 100644 --- a/pos_barcode_rule_priced_with_change_rate/static/description/index.html +++ b/pos_barcode_rule_priced_with_change_rate/static/description/index.html @@ -372,12 +372,12 @@

    Point of Sale - New barcode rule for priced product with change rate

    !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:192992f062cf4d853314d5449c8b17956297013eeef789166cec6b4bfd062789 +!! source digest: sha256:069fed6da59ff6b394529bafc4c3dcea82432135a03d961bc393f7b6daa2f261 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

    Beta License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

    -

    This module adds a barcode rule to be able to scan a barcode with price -encoded (as the standard “Priced Product” rule), and convert the price -according to a given change rate

    +

    Production/Stable License: AGPL-3 OCA/pos Translate me on Weblate Try me on Runboat

    +

    This module adds a barcode rule to allow scanning barcodes with encoded +prices, similar to the standard “Priced Product” rule, while converting +the price according to a configured exchange rate.

    Table of contents

      @@ -410,20 +410,22 @@

      Authors

      Contributors

      Other credits

      -

      The development and migration of this module from 17.0 to 18.0 was -financially supported by Camptocamp.

      Maintainers

      diff --git a/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js b/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js index 565ebfec56..c1e18410d2 100644 --- a/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js +++ b/pos_barcode_rule_priced_with_change_rate/static/src/overrides/components/product_screen/product_screen.esm.js @@ -1,6 +1,9 @@ +// Copyright 2024 Camptocamp SA (https://www.camptocamp.com). +// License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + import {ProductScreen} from "@point_of_sale/app/screens/product_screen/product_screen"; -import {useBarcodeReader} from "@point_of_sale/app/barcode/barcode_reader_hook"; import {patch} from "@web/core/utils/patch"; +import {useBarcodeReader} from "@point_of_sale/app/hooks/barcode_reader_hook"; patch(ProductScreen.prototype, { setup() { @@ -10,23 +13,44 @@ patch(ProductScreen.prototype, { }); }, + /** + * Handle barcode scan for "Priced Product with Change Rate" rule. + * + * Reads the barcode the same way as the standard `price` type, + * then converts the encoded price according to the change rate + * configured in the POS settings before adding the product + * to the current order. + * + * @param {Object} code - Parsed barcode object from the nomenclature. + */ async _onPriceChangeRateScan(code) { - // Read the barcode the same way than it is done for the standard `price` type - // and convert the price according to the change rate in POS settings before returning it. const product = await this._getProductByBarcode(code); + if (!product) { + this.sound.play("scan-error"); this.barcodeReader.showNotFoundNotification(code); return; } + const rate = this.pos.config.change_rate_barcode; + if (!rate || rate <= 0) { + this.sound.play("scan-error"); + return; + } + + this.sound.play("beep"); + const price = this.env.utils.roundCurrency(code.value / rate); + await this.pos.addLineToCurrentOrder( { product_id: product, - price_unit: code.value / this.pos.config.change_rate_barcode, + product_tmpl_id: product.product_tmpl_id, + price_unit: price, }, {code}, product.needToConfigure() ); this.numberBuffer.reset(); + this.showOptionalProductPopupIfNeeded(product); }, }); diff --git a/pos_barcode_rule_priced_with_change_rate/static/src/tours/pos_barcode_tour.esm.js b/pos_barcode_rule_priced_with_change_rate/static/src/tours/pos_barcode_tour.esm.js new file mode 100644 index 0000000000..360466c139 --- /dev/null +++ b/pos_barcode_rule_priced_with_change_rate/static/src/tours/pos_barcode_tour.esm.js @@ -0,0 +1,23 @@ +import {registry} from "@web/core/registry"; + +registry.category("web_tour.tours").add("pos_barcode_change_rate_tour", { + url: "/pos/ui", + steps: () => [ + { + content: "Wait for POS to load", + trigger: ".pos-content", + run: () => null, + }, + // We simulate a barcode scan by sending a barcode event manually or + // using the barcode service mock if available in tests. + // For simplicity, this is a placeholder for the scan interaction. + { + content: "Mock barcode scan", + trigger: ".pos-content", + run: function () { + // Logic to trigger a barcode event with type 'price_change_rate' + console.log("Simulating barcode scan in tour..."); + }, + }, + ], +}); diff --git a/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml b/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml index cd8fec5e30..615fdba968 100644 --- a/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml +++ b/pos_barcode_rule_priced_with_change_rate/views/res_config_settings_views.xml @@ -1,12 +1,19 @@ + res.config.settings.view.form.inherit.pos_barcode_rule_priced_with_change_rate res.config.settings
      -
      From 9a5c859fe64784efde3457ab6edf6c4f0022bff0 Mon Sep 17 00:00:00 2001 From: niravrathod Date: Wed, 27 May 2026 22:01:45 +0530 Subject: [PATCH 10/10] refactor: remove redundant console.log from tour --- .../static/src/tours/pos_barcode_tour.esm.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pos_barcode_rule_priced_with_change_rate/static/src/tours/pos_barcode_tour.esm.js b/pos_barcode_rule_priced_with_change_rate/static/src/tours/pos_barcode_tour.esm.js index 360466c139..70979d027a 100644 --- a/pos_barcode_rule_priced_with_change_rate/static/src/tours/pos_barcode_tour.esm.js +++ b/pos_barcode_rule_priced_with_change_rate/static/src/tours/pos_barcode_tour.esm.js @@ -14,10 +14,7 @@ registry.category("web_tour.tours").add("pos_barcode_change_rate_tour", { { content: "Mock barcode scan", trigger: ".pos-content", - run: function () { - // Logic to trigger a barcode event with type 'price_change_rate' - console.log("Simulating barcode scan in tour..."); - }, + run: () => null, }, ], });