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 @@ -37,7 +37,7 @@ addon | version | maintainers | summary
[shopfloor_mobile_base](shopfloor_mobile_base/) | 16.0.1.2.1 | <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
[shopfloor_mobile_base_auth_api_key](shopfloor_mobile_base_auth_api_key/) | 16.0.1.0.0 | | Provides authentication via API key to Shopfloor base mobile app
[shopfloor_product_dimension](shopfloor_product_dimension/) | 16.0.1.0.0 | <a href='https://github.com/rousseldenis'><img src='https://github.com/rousseldenis.png' width='32' height='32' style='border-radius:50%;' alt='rousseldenis'/></a> | This module allow to enrich product available details about its dimension in shopfloor
[shopfloor_reception](shopfloor_reception/) | 16.0.1.11.2 | <a href='https://github.com/mmequignon'><img src='https://github.com/mmequignon.png' width='32' height='32' style='border-radius:50%;' alt='mmequignon'/></a> <a href='https://github.com/JuMiSanAr'><img src='https://github.com/JuMiSanAr.png' width='32' height='32' style='border-radius:50%;' alt='JuMiSanAr'/></a> | Reception scenario for shopfloor
[shopfloor_reception](shopfloor_reception/) | 16.0.1.11.4 | <a href='https://github.com/mmequignon'><img src='https://github.com/mmequignon.png' width='32' height='32' style='border-radius:50%;' alt='mmequignon'/></a> <a href='https://github.com/JuMiSanAr'><img src='https://github.com/JuMiSanAr.png' width='32' height='32' style='border-radius:50%;' alt='JuMiSanAr'/></a> | Reception scenario for shopfloor
[shopfloor_reception_mobile](shopfloor_reception_mobile/) | 16.0.1.4.0 | <a href='https://github.com/JuMiSanAr'><img src='https://github.com/JuMiSanAr.png' width='32' height='32' style='border-radius:50%;' alt='JuMiSanAr'/></a> | Scenario for receiving products
[shopfloor_reception_packaging_dimension](shopfloor_reception_packaging_dimension/) | 16.0.1.1.0 | <a href='https://github.com/TDu'><img src='https://github.com/TDu.png' width='32' height='32' style='border-radius:50%;' alt='TDu'/></a> | Collect Packaging Dimension from the Reception scenario
[shopfloor_reception_packaging_dimension_mobile](shopfloor_reception_packaging_dimension_mobile/) | 16.0.1.1.0 | <a href='https://github.com/TDu'><img src='https://github.com/TDu.png' width='32' height='32' style='border-radius:50%;' alt='TDu'/></a> | Frontend for the packaging dimension on reception scenario
Expand Down
10 changes: 6 additions & 4 deletions shopfloor/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2026-01-08 17:42+0000\n"
"PO-Revision-Date: 2026-06-22 19:46+0000\n"
"Last-Translator: mymage <stefano.consolaro@mymage.it>\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"
"X-Generator: Weblate 5.15.2\n"

#. module: shopfloor
#: model:ir.model.fields,help:shopfloor.field_shopfloor_menu__pick_pack_same_time
Expand Down Expand Up @@ -284,12 +284,12 @@ msgstr "Consente creazione movimento"
#. module: shopfloor
#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__allow_quantity_exceeding_demand
msgid "Allow Quantity Exceeding Demand"
msgstr ""
msgstr "Consentire quantità superiore alla richiesta"

#. module: shopfloor
#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__allow_quantity_exceeding_demand_is_possible
msgid "Allow Quantity Exceeding Demand Is Possible"
msgstr ""
msgstr "È possibile consentire una quantità superiore alla domanda"

#. module: shopfloor
#: model:ir.model.fields,field_description:shopfloor.field_shopfloor_menu__allow_return_is_possible
Expand Down Expand Up @@ -573,6 +573,8 @@ msgstr "Merce caricata in {0.name}"
msgid ""
"If True, prevents shopfloor error in case you process more qty than planned."
msgstr ""
"Se vero, previene l'errore del reparto nel caso si lavori più quantità della "
"pianificata."

#. module: shopfloor
#: model:ir.model.fields,help:shopfloor.field_stock_move_line__result_package_id
Expand Down
2 changes: 1 addition & 1 deletion shopfloor_reception/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Shopfloor Reception
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:699ec229276cf6bc2cbee82b6a7745f9a647aedf5fb0227002bdeae20ef65032
!! source digest: sha256:bc12b448e98940e187bbbc914cc85749f7c27319d3c4ce7f3dfc0f2228554e56
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
Expand Down
2 changes: 1 addition & 1 deletion shopfloor_reception/__manifest__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Shopfloor Reception",
"summary": "Reception scenario for shopfloor",
"version": "16.0.1.11.2",
"version": "16.0.1.11.4",
"development_status": "Beta",
"category": "Inventory",
"website": "https://github.com/OCA/wms",
Expand Down
4 changes: 2 additions & 2 deletions shopfloor_reception/i18n/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Odoo Server 14.0\n"
"Report-Msgid-Bugs-To: \n"
"PO-Revision-Date: 2026-06-03 07:05+0000\n"
"PO-Revision-Date: 2026-06-22 19:46+0000\n"
"Last-Translator: mymage <stefano.consolaro@mymage.it>\n"
"Language-Team: none\n"
"Language: it\n"
Expand Down Expand Up @@ -82,7 +82,7 @@ msgstr ""
#: code:addons/shopfloor_reception/actions/message.py:0
#, python-format
msgid "The scanned lot does not match the selected product"
msgstr ""
msgstr "Il lotto letto non corrisponde al prodotto selezionato"

#. module: shopfloor_reception
#. odoo-python
Expand Down
13 changes: 10 additions & 3 deletions shopfloor_reception/services/reception.py
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,11 @@ def scan_lot(self, picking_id, selected_line_id, barcode):
if result.type == "lot":
lot_name = result.value
elif result.type == "expiration_date":
lot_expiration_date = result.value
# We need to ensure we have a `datetime` object (and not a
# `date` one) for valid comparison with stock.lot.expiration_date
lot_expiration_date = datetime.combine(
result.value, datetime.min.time()
)
elif (
result.type == "product"
and result.raw != selected_line.product_id.barcode
Expand Down Expand Up @@ -1285,8 +1289,11 @@ def set_lot_confirm_action(
)

product = selected_line.product_id
lot = self.search_result.record or self._actions_for("search").lot_from_scan(
lot_name, product
search_result_record = self.search_result.record
lot = (
search_result_record
if search_result_record and search_result_record._name == "stock.lot"
else self._actions_for("search").lot_from_scan(lot_name, product)
)

if product.use_expiration_date and (
Expand Down
2 changes: 1 addition & 1 deletion shopfloor_reception/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ <h1>Shopfloor Reception</h1>
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:699ec229276cf6bc2cbee82b6a7745f9a647aedf5fb0227002bdeae20ef65032
!! source digest: sha256:bc12b448e98940e187bbbc914cc85749f7c27319d3c4ce7f3dfc0f2228554e56
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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_reception"><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_reception"><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 implementation of the reception scenario.
Expand Down
Loading
Loading