odoo-addon-shopfloor 16.0.2.10.1__py3-none-any.whl → 16.0.2.12.0__py3-none-any.whl

odoo/addons/shopfloor/README.rst

@@ -11,7 +11,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:3b3e7f94a81872e7868a889ce80740558ad70732df2821188971ff06a639e995
+   !! source digest: sha256:c418f1851f7591fa3b9cde9ce01a2a3507baf0066f7453d93cfea051273d85fc
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/shopfloor/__manifest__.py

@@ -6,7 +6,7 @@
 {
     "name": "Shopfloor",
     "summary": "manage warehouse operations with barcode scanners",
-    "version": "16.0.2.10.1",
+    "version": "16.0.2.12.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",

odoo/addons/shopfloor/actions/__init__.py

@@ -1,3 +1,4 @@
+from . import barcode_parser
 from . import change_package_lot
 from . import data
 from . import data_detail

odoo/addons/shopfloor/actions/barcode_parser.py

@@ -0,0 +1,44 @@
+# Copyright 2025 ACSONE SA/NV (https://www.acsone.eu)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo.addons.component.core import Component
+
+from ..actions.search import SearchAction
+
+
+class BarcodeResult:
+
+    __slots__ = ("type", "value", "raw")
+
+    def __init__(self, **kw) -> None:
+        for k in self.__slots__:
+            setattr(self, k, kw.get(k))
+
+
+class BarcodeParser(Component):
+    """
+    Some barcodes can have complex data structure
+    """
+
+    _name = "shopfloor.barcode.parser"
+    _inherit = "shopfloor.process.action"
+    _usage = "barcode"
+
+    def __init__(self, search_action: SearchAction):
+        # Get search action keys
+        self.search_action = search_action
+
+    @property
+    def _authorized_barcode_types(self):
+        return self.search_action._barcode_type_handler.keys()
+
+    def parse(self, barcode, types) -> list[BarcodeResult]:
+        """
+        This method will parse the barcode and return the
+        value with its type if determined.
+
+        Override this to implement specific parsing
+
+        """
+
+        return [BarcodeResult(type="unknown", value=barcode, raw=barcode)]

odoo/addons/shopfloor/actions/search.py

@@ -8,7 +8,8 @@ from odoo.addons.component.core import Component
 
 
 class SearchResult:
-    __slots__ = ("record", "type", "code")
+
+    __slots__ = ("record", "type", "code", "parse_result")
 
     def __init__(self, **kw) -> None:
         for k in self.__slots__:
@@ -44,6 +45,12 @@ class SearchAction(Component):
 
     _inherit = "shopfloor.search.action"
 
+    @property
+    def parser(self):
+        parser = self._actions_for("barcode")
+        parser.search_action = self
+        return parser
+
     @property
     def _barcode_type_handler(self):
         return {
@@ -57,6 +64,8 @@ class SearchAction(Component):
             "packaging": self.packaging_from_scan,
             "delivery_packaging": self.delivery_packaging_from_scan,
             "origin_move": self.origin_move_from_scan,
+            # Extra data can be contained in barcodes
+            "expiration_date": self.expiration_date_from_scan,
         }
 
     def _make_search_result(self, **kwargs):
@@ -85,11 +94,20 @@ class SearchAction(Component):
     def generic_find(self, barcode, types=None, handler_kw=None):
         _types = types or self._barcode_type_handler.keys()
         # TODO: decide the best default order in case we don't pass `types`
-        for btype in _types:
-            record = self._find_record_by_type(barcode, btype, handler_kw)
-            if record:
-                return self._make_search_result(record=record, code=barcode, type=btype)
-        return self._make_search_result(type="none")
+        parse_results = self.parser.parse(barcode, types)
+        for parse_result in parse_results:
+            for btype in _types:
+                record = self._find_record_by_type(
+                    parse_result.value, btype, handler_kw
+                )
+                if record:
+                    return self._make_search_result(
+                        record=record,
+                        code=barcode,
+                        type=btype,
+                        parse_result=parse_results,
+                    )
+        return self._make_search_result(type="none", parse_result=parse_results)
 
     def location_from_scan(self, barcode, limit=1):
         model = self.env["stock.location"]
@@ -188,3 +206,10 @@ class SearchAction(Component):
         if extra_domain:
             outgoing_move_domain = AND([outgoing_move_domain, extra_domain])
         return model.search(outgoing_move_domain)
+
+    def dummy_from_scan(self, barcode):
+        return None
+
+    def expiration_date_from_scan(self, barcode):
+        # TODO
+        return None

odoo/addons/shopfloor/actions/stock.py

@@ -108,7 +108,13 @@ class StockAction(Component):
         return picking.copy(return_values)
 
     def mark_move_line_as_picked(
-        self, move_lines, quantity=None, package=None, user=None, check_user=False
+        self,
+        move_lines,
+        quantity=None,
+        package=None,
+        user=None,
+        check_user=False,
+        split=True,
     ):
         """Set the qty_done and extract lines in new order"""
         user = user or self.env.user
@@ -121,7 +127,8 @@ class StockAction(Component):
         for line in move_lines:
             qty_done = quantity if quantity is not None else line.reserved_uom_qty
             line.qty_done = qty_done
-            line._split_partial_quantity()
+            if split:
+                line._split_partial_quantity()
             data = {
                 "shopfloor_user_id": user.id,
             }
@@ -129,13 +136,19 @@ class StockAction(Component):
                 # destination package is set to the scanned one
                 data["result_package_id"] = package.id
             line.write(data)
+        values_assigned = {
+            "user_id": user.id,
+            "printed": True,
+        }
         # Extract the picked quantity in a split order and set current user
-        move_lines._extract_in_split_order(
-            {
-                "user_id": user.id,
-                "printed": True,
-            }
-        )
+        if split:
+            move_lines._extract_in_split_order(values_assigned)
+        else:
+            lines = move_lines.picking_id.filtered(
+                lambda picking: not picking.printed or not picking.user_id == user
+            )
+            if lines:
+                lines.write(values_assigned)
         move_lines.picking_id.filtered(lambda p: p.user_id != user).user_id = user.id
 
     def unmark_move_line_as_picked(self, move_lines):

odoo/addons/shopfloor/static/description/index.html

@@ -372,7 +372,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:3b3e7f94a81872e7868a889ce80740558ad70732df2821188971ff06a639e995
+!! source digest: sha256:c418f1851f7591fa3b9cde9ce01a2a3507baf0066f7453d93cfea051273d85fc
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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>

{odoo_addon_shopfloor-16.0.2.10.1.dist-info → odoo_addon_shopfloor-16.0.2.12.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-shopfloor
-Version: 16.0.2.10.1
+Version: 16.0.2.12.0
 Summary: manage warehouse operations with barcode scanners
 Home-page: https://github.com/OCA/wms
 Author: Camptocamp, BCIM, Akretion, Odoo Community Association (OCA)
@@ -40,7 +40,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:3b3e7f94a81872e7868a889ce80740558ad70732df2821188971ff06a639e995
+   !! source digest: sha256:c418f1851f7591fa3b9cde9ce01a2a3507baf0066f7453d93cfea051273d85fc
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_shopfloor-16.0.2.10.1.dist-info → odoo_addon_shopfloor-16.0.2.12.0.dist-info}/RECORD

@@ -1,9 +1,10 @@
-odoo/addons/shopfloor/README.rst,sha256=D3OjlLOup8oQlS52jiTd2kMoogVcJIy3WwQzu29um6w,5483
+odoo/addons/shopfloor/README.rst,sha256=UgZDCz4HK5OOLW_5n4GsL2AarZ-ues_g1A0_eGrLIhc,5483
 odoo/addons/shopfloor/__init__.py,sha256=ke3RmZ7XkX-lz4S8NHAxNIEJ5_Nvj5bjBAqD-W-q73c,91
-odoo/addons/shopfloor/__manifest__.py,sha256=5WSR1SQH0zI3PtOqoBMj2KaehCzYaXq5S3s7xMnwmaw,2246
+odoo/addons/shopfloor/__manifest__.py,sha256=SX-ZCT7UZrAlhaZxcKVH0h2dXnRHvEvpzE6zaVgxVnU,2246
 odoo/addons/shopfloor/exceptions.py,sha256=81KpIGVkuYRhA0cIuml4pg4G3izqkAAhLqoXZbUd4X8,197
 odoo/addons/shopfloor/utils.py,sha256=Be7J8Tu7ivOW4lpe8IjKxwqfTwfmK-ZkeFEavoYIIF4,375
-odoo/addons/shopfloor/actions/__init__.py,sha256=_yTf-NtaJmSylBJIoJJvKNYEI-wlqpyRw-S5eJRRzEM,400
+odoo/addons/shopfloor/actions/__init__.py,sha256=HhwibjwfE3oe7vIJtiUV0I7L2Z1bmoaqi7R5dElWhS0,429
+odoo/addons/shopfloor/actions/barcode_parser.py,sha256=ngj5moIL9r6LD9Yt7NsXNvX2JeJAXL3G2lVzKI0-Y7k,1164
 odoo/addons/shopfloor/actions/change_package_lot.py,sha256=-esK7FKHaXKGOwL8RON_yZCLwIEZWZqriHxtx99TO9k,7264
 odoo/addons/shopfloor/actions/completion_info.py,sha256=Q_wlx8VJHOPFZbwGrxHBYa-gt04ZAXBsRBGh0aLuRrk,1483
 odoo/addons/shopfloor/actions/data.py,sha256=TF02p2ksynxxOLnkAeqZWCcJVFOhRUQS45O4l5p-oNw,12856
@@ -16,8 +17,8 @@ odoo/addons/shopfloor/actions/packaging.py,sha256=uZxD1bisNS_8M5ZQAHuOz2MR6l26XH
 odoo/addons/shopfloor/actions/savepoint.py,sha256=bIpPUPg-2BbO8hz277kWnq4DP_cayhAB_v8Rp2mUHjg,1143
 odoo/addons/shopfloor/actions/schema.py,sha256=H_4HCaYB7HiqU35WO2NmHtOLJ087iFLbiJD4HdiHFjU,8555
 odoo/addons/shopfloor/actions/schema_detail.py,sha256=_xtm8ptRXAPBIMTyr8XKMQtogcjBudh-QRqKUZEEHGU,4968
-odoo/addons/shopfloor/actions/search.py,sha256=8AvMOyxUd9iY_Cb84TccW4i5EfvUhIBQzOiLN4Y1Bcw,6856
-odoo/addons/shopfloor/actions/stock.py,sha256=mhAwsAGFZjV8PZ3QjLIz8tsRAm3u3S3_7yiONmkaZM0,10762
+odoo/addons/shopfloor/actions/search.py,sha256=R2ZiugKCD6VekDGs_UZyrUI3AUCdJ387IZ4lco45A8w,7619
+odoo/addons/shopfloor/actions/stock.py,sha256=5TUJa--aFlD5Y_atRQvWzbzicUrnE8CHd4v6xuZg6dY,11109
 odoo/addons/shopfloor/actions/stock_unreserve.py,sha256=P0a9V53MqG4sDln8yX0Id-nEXz7cydiFY_BBznioQpg,3090
 odoo/addons/shopfloor/components/__init__.py,sha256=a3ox1WOD1JhrQUrYMRn-yDJI0Vvc7ciKdmXuZB29ToU,173
 odoo/addons/shopfloor/components/scan_handler_location.py,sha256=LImiaG4L4xBKUFWZLSnJV-eSCvj_NCDCM5GqZSnsPmE,825
@@ -85,7 +86,7 @@ odoo/addons/shopfloor/services/zone_picking.py,sha256=9GFw2AKBFFci8Erb8UyTAYuCI9
 odoo/addons/shopfloor/services/forms/__init__.py,sha256=nxwJdKX47hb56ERf4Qb3UE5dkdsHCbkaXMAXs4XMAd8,27
 odoo/addons/shopfloor/services/forms/picking_form.py,sha256=F15G5yw78Pd1WgPjMz00-K1JyGaTdfdvVYzG4Dubpqk,2626
 odoo/addons/shopfloor/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/shopfloor/static/description/index.html,sha256=XfEe9kuWu6sJXPygow9YoykFqiUw8IrfPoQuPsgX0JQ,17775
+odoo/addons/shopfloor/static/description/index.html,sha256=G43IO-oa2cGIv7agAu0lFpVbC53uYGa95I1LP8lkfUM,17775
 odoo/addons/shopfloor/tests/__init__.py,sha256=4WHuLVjOX_lndDJyuyGcreNckArFJL2HA5PPFlhT6FM,3962
 odoo/addons/shopfloor/tests/common.py,sha256=nU-1CYbAi2hoI2jFIcw6udgl1ave_IGJciyOZ9DeiAE,11610
 odoo/addons/shopfloor/tests/models.py,sha256=PWNPC6DgFMbrarojSxUqwycnBdePX-4Q5Z0rn1WwQqY,940
@@ -187,7 +188,7 @@ odoo/addons/shopfloor/views/shopfloor_menu.xml,sha256=rKXjj0Jk8gjda1y1B6d1_s3sn0
 odoo/addons/shopfloor/views/stock_location.xml,sha256=d7iqbOQZbb5YPSdAXlQ6spcj8dUvQ37DpEGuaLX5B1M,829
 odoo/addons/shopfloor/views/stock_move_line.xml,sha256=tn3pV67aRoYmn3qkm3aSgdYArY-z9SIrl_4fpJFy3Jo,1984
 odoo/addons/shopfloor/views/stock_picking_type.xml,sha256=Ckn2835hO4HtuZQX9x3382C4gs789fb94Cx0444mBkc,800
-odoo_addon_shopfloor-16.0.2.10.1.dist-info/METADATA,sha256=tFC5kwKHiWn2kNX_DqkRIg0GruHpdBOQ0h_vMxqQ__4,6927
-odoo_addon_shopfloor-16.0.2.10.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-odoo_addon_shopfloor-16.0.2.10.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_shopfloor-16.0.2.10.1.dist-info/RECORD,,
+odoo_addon_shopfloor-16.0.2.12.0.dist-info/METADATA,sha256=dF9chlSU77c5UiwWQQ8YipWPOdPCZHg5I_81NKfxF3A,6927
+odoo_addon_shopfloor-16.0.2.12.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_shopfloor-16.0.2.12.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_shopfloor-16.0.2.12.0.dist-info/RECORD,,