Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | <a href='https://github.com/jbaudoux'><img src='https://github.com/jbaudoux.png' width='32' height='32' style='border-radius:50%;' alt='jbaudoux'/></a> | 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 | <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | 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 | <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | Filters channels on sales based on selected carrier.
[shopfloor](shopfloor/) | 16.0.2.16.0 | <a href='https://github.com/guewen'><img src='https://github.com/guewen.png' width='32' height='32' style='border-radius:50%;' alt='guewen'/></a> <a href='https://github.com/simahawk'><img src='https://github.com/simahawk.png' width='32' height='32' style='border-radius:50%;' alt='simahawk'/></a> <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | manage warehouse operations with barcode scanners
[shopfloor](shopfloor/) | 16.0.2.16.1 | <a href='https://github.com/guewen'><img src='https://github.com/guewen.png' width='32' height='32' style='border-radius:50%;' alt='guewen'/></a> <a href='https://github.com/simahawk'><img src='https://github.com/simahawk.png' width='32' height='32' style='border-radius:50%;' alt='simahawk'/></a> <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | manage warehouse operations with barcode scanners
[shopfloor_base](shopfloor_base/) | 16.0.1.2.0 | <a href='https://github.com/guewen'><img src='https://github.com/guewen.png' width='32' height='32' style='border-radius:50%;' alt='guewen'/></a> <a href='https://github.com/simahawk'><img src='https://github.com/simahawk.png' width='32' height='32' style='border-radius:50%;' alt='simahawk'/></a> <a href='https://github.com/sebalix'><img src='https://github.com/sebalix.png' width='32' height='32' style='border-radius:50%;' alt='sebalix'/></a> | Core module for creating mobile apps
[shopfloor_batch_automatic_creation](shopfloor_batch_automatic_creation/) | 16.0.1.1.0 | <a href='https://github.com/guewen'><img src='https://github.com/guewen.png' width='32' height='32' style='border-radius:50%;' alt='guewen'/></a> | Create batch transfers for Cluster Picking
[shopfloor_mobile](shopfloor_mobile/) | 16.0.1.4.0 | <a href='https://github.com/simahawk'><img src='https://github.com/simahawk.png' width='32' height='32' style='border-radius:50%;' alt='simahawk'/></a> | Mobile frontend for WMS Shopfloor app
Expand Down
2 changes: 1 addition & 1 deletion shopfloor/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion shopfloor/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion shopfloor/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ <h1>Shopfloor</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:8775bde18eb05cb1feb84336aec2ec97cf39d328f5b9c0dde785ac4f73f7f950
!! source digest: sha256:9f90d6a5968a33846a7f00f6daac7c54a3097b54e13d308bdc964d8115207c58
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/wms/tree/16.0/shopfloor"><img alt="OCA/wms" src="https://img.shields.io/badge/github-OCA%2Fwms-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/wms-16-0/wms-16-0-shopfloor"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/wms&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>Shopfloor is a barcode scanner application for internal warehouse operations.</p>
Expand Down
10 changes: 8 additions & 2 deletions shopfloor/tests/test_actions_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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",
}
Expand Down
10 changes: 8 additions & 2 deletions shopfloor/tests/test_actions_data_detail.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ def test_data_picking(self):
"name": picking.name,
"note": Markup("<p>read me</p>"),
"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},
Expand Down Expand Up @@ -159,7 +162,10 @@ def test_data_picking_with_progress(self):
"name": picking.name,
"note": Markup("<p>read me</p>"),
"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},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down Expand Up @@ -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 <a href=# data-oe-model=stock.picking data-oe-"
Expand All @@ -375,6 +377,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 ""
"The following moves have been un-released: \n"
Expand All @@ -384,6 +387,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 "The operation %(picking_names)s is done and cannot be returned"
msgstr ""
Expand Down Expand Up @@ -453,6 +457,9 @@ msgstr ""
#. 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
#: code:addons/stock_available_to_promise_release/models/stock_move.py:0
#: code:addons/stock_available_to_promise_release/models/stock_move.py:0
#: 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 "Unsupported operator %s"
Expand All @@ -461,6 +468,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 "Unsupported operator: %s"
msgstr ""
Expand Down Expand Up @@ -506,6 +514,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 "You are not allowed to unrelease those deliveries:\n"
msgstr ""
Expand Down
36 changes: 30 additions & 6 deletions stock_picking_batch_creation/i18n/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 "
Expand Down
36 changes: 30 additions & 6 deletions stock_picking_batch_creation/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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 "
Expand Down
Loading