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.

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}, 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