From 3356b6a2146d618997d4abe9e48acf00150ea04e Mon Sep 17 00:00:00 2001 From: Nicolas Delbovier Date: Thu, 26 Mar 2026 14:39:09 +0100 Subject: [PATCH 1/4] [FIX] shopfloor: fix test broken after dependent module update Tests broke because of this commit in a dependent module: https://github.com/OCA/delivery-carrier/commit/9c8bd5c110e413b127eaa10dd02240ccfbadca60 See this PR: https://github.com/OCA/delivery-carrier/pull/1142 An outgoing picking is now considered its own "ship_picking_id" (which was not the case before) leading to more data than previously expected in the tests. --- shopfloor/tests/test_actions_data.py | 10 ++++++++-- shopfloor/tests/test_actions_data_detail.py | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/shopfloor/tests/test_actions_data.py b/shopfloor/tests/test_actions_data.py index b3979103635..22717b1d36a 100644 --- a/shopfloor/tests/test_actions_data.py +++ b/shopfloor/tests/test_actions_data.py @@ -153,7 +153,10 @@ def test_data_picking(self): "weight": 110.0, "partner": {"id": self.customer.id, "name": self.customer.name}, "carrier": {"id": carrier.id, "name": carrier.name}, - "ship_carrier": None, + "ship_carrier": { + "id": self.picking.ship_carrier_id.id, + "name": self.picking.ship_carrier_id.name, + }, "priority": "0", } self.assertEqual(data.pop("scheduled_date").split("T")[0], "2020-08-03") @@ -177,7 +180,10 @@ def test_data_picking_with_progress(self): "weight": 110.0, "partner": {"id": self.customer.id, "name": self.customer.name}, "carrier": {"id": carrier.id, "name": carrier.name}, - "ship_carrier": None, + "ship_carrier": { + "id": self.picking.ship_carrier_id.id, + "name": self.picking.ship_carrier_id.name, + }, "progress": 0.0, "priority": "0", } diff --git a/shopfloor/tests/test_actions_data_detail.py b/shopfloor/tests/test_actions_data_detail.py index 9cda26bbd70..d149640a286 100644 --- a/shopfloor/tests/test_actions_data_detail.py +++ b/shopfloor/tests/test_actions_data_detail.py @@ -122,7 +122,10 @@ def test_data_picking(self): "name": picking.name, "note": Markup("

read me

"), "origin": "created by test", - "ship_carrier": None, + "ship_carrier": { + "id": picking.ship_carrier_id.id, + "name": picking.ship_carrier_id.name, + }, "weight": 110.0, "partner": {"id": self.customer.id, "name": self.customer.name}, "carrier": {"id": picking.carrier_id.id, "name": picking.carrier_id.name}, @@ -159,7 +162,10 @@ def test_data_picking_with_progress(self): "name": picking.name, "note": Markup("

read me

"), "origin": "created by test", - "ship_carrier": None, + "ship_carrier": { + "id": picking.ship_carrier_id.id, + "name": picking.ship_carrier_id.name, + }, "weight": 110.0, "partner": {"id": self.customer.id, "name": self.customer.name}, "carrier": {"id": picking.carrier_id.id, "name": picking.carrier_id.name}, From 0bffe1c7f8da1d3e03615179134fbfe866c44d6f Mon Sep 17 00:00:00 2001 From: oca-ci Date: Mon, 30 Mar 2026 16:17:10 +0000 Subject: [PATCH 2/4] [UPD] Update stock_available_to_promise_release.pot --- .../i18n/stock_available_to_promise_release.pot | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/stock_available_to_promise_release/i18n/stock_available_to_promise_release.pot b/stock_available_to_promise_release/i18n/stock_available_to_promise_release.pot index 493952fe07c..434de62722b 100644 --- a/stock_available_to_promise_release/i18n/stock_available_to_promise_release.pot +++ b/stock_available_to_promise_release/i18n/stock_available_to_promise_release.pot @@ -26,6 +26,7 @@ msgstr "" #. module: stock_available_to_promise_release #. odoo-python #: code:addons/stock_available_to_promise_release/models/stock_move.py:0 +#: code:addons/stock_available_to_promise_release/models/stock_move.py:0 #, python-format msgid "- blocking transfer(s): %(picking_names)s" msgstr "" @@ -366,6 +367,7 @@ msgstr "" #. module: stock_available_to_promise_release #. odoo-python #: code:addons/stock_available_to_promise_release/models/stock_picking.py:0 +#: code:addons/stock_available_to_promise_release/models/stock_picking.py:0 #, python-format msgid "" "The backorder Date: Mon, 30 Mar 2026 16:29:26 +0000 Subject: [PATCH 3/4] [BOT] post-merge updates --- README.md | 2 +- shopfloor/README.rst | 2 +- shopfloor/__manifest__.py | 2 +- shopfloor/static/description/index.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1f260044587..908dc64d6b7 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ addon | version | maintainers | summary [sale_stock_release_channel_delivery_date](sale_stock_release_channel_delivery_date/) | 16.0.1.1.2 | jbaudoux | Compute expected date based on available release channels [sale_stock_release_channel_partner_by_date](sale_stock_release_channel_partner_by_date/) | 16.0.1.1.0 | sebalix | Release channels integration with Sales [sale_stock_release_channel_partner_by_date_delivery](sale_stock_release_channel_partner_by_date_delivery/) | 16.0.1.1.1 | sebalix | Filters channels on sales based on selected carrier. -[shopfloor](shopfloor/) | 16.0.2.16.0 | guewen simahawk sebalix | manage warehouse operations with barcode scanners +[shopfloor](shopfloor/) | 16.0.2.16.1 | guewen simahawk sebalix | manage warehouse operations with barcode scanners [shopfloor_base](shopfloor_base/) | 16.0.1.2.0 | guewen simahawk sebalix | Core module for creating mobile apps [shopfloor_batch_automatic_creation](shopfloor_batch_automatic_creation/) | 16.0.1.1.0 | guewen | Create batch transfers for Cluster Picking [shopfloor_mobile](shopfloor_mobile/) | 16.0.1.4.0 | simahawk | Mobile frontend for WMS Shopfloor app diff --git a/shopfloor/README.rst b/shopfloor/README.rst index c7dc1e8ff36..16df3b9d278 100644 --- a/shopfloor/README.rst +++ b/shopfloor/README.rst @@ -11,7 +11,7 @@ Shopfloor !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:8775bde18eb05cb1feb84336aec2ec97cf39d328f5b9c0dde785ac4f73f7f950 + !! source digest: sha256:9f90d6a5968a33846a7f00f6daac7c54a3097b54e13d308bdc964d8115207c58 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/shopfloor/__manifest__.py b/shopfloor/__manifest__.py index 4961f4158b1..1aefbb909cb 100644 --- a/shopfloor/__manifest__.py +++ b/shopfloor/__manifest__.py @@ -6,7 +6,7 @@ { "name": "Shopfloor", "summary": "manage warehouse operations with barcode scanners", - "version": "16.0.2.16.0", + "version": "16.0.2.16.1", "development_status": "Beta", "category": "Inventory", "website": "https://github.com/OCA/wms", diff --git a/shopfloor/static/description/index.html b/shopfloor/static/description/index.html index 948145d696d..86a779984fb 100644 --- a/shopfloor/static/description/index.html +++ b/shopfloor/static/description/index.html @@ -372,7 +372,7 @@

Shopfloor

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:8775bde18eb05cb1feb84336aec2ec97cf39d328f5b9c0dde785ac4f73f7f950 +!! source digest: sha256:9f90d6a5968a33846a7f00f6daac7c54a3097b54e13d308bdc964d8115207c58 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

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

Shopfloor is a barcode scanner application for internal warehouse operations.

From d0f3cd6fcd1c4ffdf2b54f0f2ef3480fd0fb5684 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 30 Mar 2026 16:29:39 +0000 Subject: [PATCH 4/4] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: wms-16.0/wms-16.0-stock_picking_batch_creation Translate-URL: https://translation.odoo-community.org/projects/wms-16-0/wms-16-0-stock_picking_batch_creation/ --- stock_picking_batch_creation/i18n/fr.po | 36 ++++++++++++++++++++----- stock_picking_batch_creation/i18n/it.po | 36 ++++++++++++++++++++----- 2 files changed, 60 insertions(+), 12 deletions(-) diff --git a/stock_picking_batch_creation/i18n/fr.po b/stock_picking_batch_creation/i18n/fr.po index 92c64904dcc..0d7c2ceab43 100644 --- a/stock_picking_batch_creation/i18n/fr.po +++ b/stock_picking_batch_creation/i18n/fr.po @@ -145,6 +145,11 @@ msgstr "Matériel de préparation pour le transfert" msgid "Diagnostic" msgstr "Diagnostic" +#. module: stock_picking_batch_creation +#: model:ir.model.fields.selection,name:stock_picking_batch_creation.selection__stock_device_type__split_mode__dimension +msgid "Dimension" +msgstr "" + #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_make_picking_batch__display_name #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_stock_device_type__display_name @@ -244,8 +249,8 @@ msgstr "Volume max par bac" #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_make_picking_batch__maximum_number_of_preparation_lines -msgid "Maximum number of preparation lines for the batch" -msgstr "Nombre maximum de lignes de préparation pour la vague" +msgid "Maximum number of preparation lines for the batch." +msgstr "" #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_stock_device_type__user_max_volume @@ -361,6 +366,16 @@ msgstr "" msgid "SQL FOR UPDATE SKIP LOCKED" msgstr "SQL FOR UPDATE SKIP LOCKED" +#. module: stock_picking_batch_creation +#: model:ir.model.fields,help:stock_picking_batch_creation.field_make_picking_batch__maximum_number_of_preparation_lines +msgid "Set to 0 to disable." +msgstr "" + +#. module: stock_picking_batch_creation +#: model:ir.model.fields,field_description:stock_picking_batch_creation.field_stock_device_type__split_mode +msgid "Split Mode" +msgstr "" + #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_make_picking_batch__split_picking_exceeding_limits msgid "Split pickings exceeding limits" @@ -406,8 +421,8 @@ msgstr "Unités de mesure de volume" #. module: stock_picking_batch_creation #: model:ir.model.fields,help:stock_picking_batch_creation.field_stock_device_type__max_volume #: model:ir.model.fields,help:stock_picking_batch_creation.field_stock_device_type__min_volume -msgid "Volume in default system volume unit of measure" -msgstr "Volume dans l'unité de mesure de volume par défaut du système" +msgid "Volume in default system volume unit of measure. Set to 0 to disable." +msgstr "" #. module: stock_picking_batch_creation #: model:ir.model.fields,help:stock_picking_batch_creation.field_stock_device_type__user_weight_uom_id @@ -421,8 +436,8 @@ msgstr "Unités de mesure de poids" #. module: stock_picking_batch_creation #: model:ir.model.fields,help:stock_picking_batch_creation.field_stock_device_type__max_weight -msgid "Weight in default system weight unit of measure" -msgstr "Poids dans l'unité de mesure de poids par défaut du système" +msgid "Weight in default system weight unit of measure. Set to 0 to disable." +msgstr "" #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_stock_device_type__user_weight_uom_name @@ -441,6 +456,15 @@ msgstr "ex: Transpalette" msgid "no candidate pickings to batch" msgstr "aucun transfert candidat à la création de la vague de préparation" +#~ msgid "Maximum number of preparation lines for the batch" +#~ msgstr "Nombre maximum de lignes de préparation pour la vague" + +#~ msgid "Volume in default system volume unit of measure" +#~ msgstr "Volume dans l'unité de mesure de volume par défaut du système" + +#~ msgid "Weight in default system weight unit of measure" +#~ msgstr "Poids dans l'unité de mesure de poids par défaut du système" + #~ msgid "Indicates the bins occupied by the picking on the device." #~ msgstr "" #~ "Indique le nombre de bacs occupées par le transfert sur le matériel de " diff --git a/stock_picking_batch_creation/i18n/it.po b/stock_picking_batch_creation/i18n/it.po index 57346a6d3f5..bc38fc6b020 100644 --- a/stock_picking_batch_creation/i18n/it.po +++ b/stock_picking_batch_creation/i18n/it.po @@ -146,6 +146,11 @@ msgstr "Dispositivi per il prelievo" msgid "Diagnostic" msgstr "Diagnostica" +#. module: stock_picking_batch_creation +#: model:ir.model.fields.selection,name:stock_picking_batch_creation.selection__stock_device_type__split_mode__dimension +msgid "Dimension" +msgstr "" + #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_make_picking_batch__display_name #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_stock_device_type__display_name @@ -248,8 +253,8 @@ msgstr "Volume massimo per contenitore" #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_make_picking_batch__maximum_number_of_preparation_lines -msgid "Maximum number of preparation lines for the batch" -msgstr "Numero massimo di righe di preparazione per il gruppo" +msgid "Maximum number of preparation lines for the batch." +msgstr "" #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_stock_device_type__user_max_volume @@ -366,6 +371,16 @@ msgstr "Restringi alla stessa priorità" msgid "SQL FOR UPDATE SKIP LOCKED" msgstr "SQL PER SALTO AGGIORNAMENTO BLOCCATO" +#. module: stock_picking_batch_creation +#: model:ir.model.fields,help:stock_picking_batch_creation.field_make_picking_batch__maximum_number_of_preparation_lines +msgid "Set to 0 to disable." +msgstr "" + +#. module: stock_picking_batch_creation +#: model:ir.model.fields,field_description:stock_picking_batch_creation.field_stock_device_type__split_mode +msgid "Split Mode" +msgstr "" + #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_make_picking_batch__split_picking_exceeding_limits msgid "Split pickings exceeding limits" @@ -411,8 +426,8 @@ msgstr "Unità di misura del volume" #. module: stock_picking_batch_creation #: model:ir.model.fields,help:stock_picking_batch_creation.field_stock_device_type__max_volume #: model:ir.model.fields,help:stock_picking_batch_creation.field_stock_device_type__min_volume -msgid "Volume in default system volume unit of measure" -msgstr "Volume nell'unità di misura del volume predefinita del sistema" +msgid "Volume in default system volume unit of measure. Set to 0 to disable." +msgstr "" #. module: stock_picking_batch_creation #: model:ir.model.fields,help:stock_picking_batch_creation.field_stock_device_type__user_weight_uom_id @@ -426,8 +441,8 @@ msgstr "Unità di misura del peso" #. module: stock_picking_batch_creation #: model:ir.model.fields,help:stock_picking_batch_creation.field_stock_device_type__max_weight -msgid "Weight in default system weight unit of measure" -msgstr "Peso nell'unità di misura del peso predefinita del sistema" +msgid "Weight in default system weight unit of measure. Set to 0 to disable." +msgstr "" #. module: stock_picking_batch_creation #: model:ir.model.fields,field_description:stock_picking_batch_creation.field_stock_device_type__user_weight_uom_name @@ -446,6 +461,15 @@ msgstr "es. muletto" msgid "no candidate pickings to batch" msgstr "nessun prelievo candidato da raggruppare" +#~ msgid "Maximum number of preparation lines for the batch" +#~ msgstr "Numero massimo di righe di preparazione per il gruppo" + +#~ msgid "Volume in default system volume unit of measure" +#~ msgstr "Volume nell'unità di misura del volume predefinita del sistema" + +#~ msgid "Weight in default system weight unit of measure" +#~ msgstr "Peso nell'unità di misura del peso predefinita del sistema" + #~ msgid "" #~ "If checked, the maximum number of lines will not be applied if there is " #~ "no candidate to add to the batch with a number of lines less than the "