odoo-addon-shopfloor 16.0.2.5.0.2__py3-none-any.whl → 16.0.2.6.0__py3-none-any.whl

odoo/addons/shopfloor/README.rst

@@ -7,7 +7,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:86239aacdfa7d7810aca5b0625ebd9112b12385d98899ac696d596b455b0c57d
+   !! source digest: sha256:15590a835f281c13f0eae031c50d19d04ab77e94ee95b697d5eabd04373c21ce
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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.5.0",
+    "version": "16.0.2.6.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",

odoo/addons/shopfloor/services/cluster_picking.py

@@ -695,16 +695,32 @@ class ClusterPicking(Component):
         if not product:
             packaging = search.packaging_from_scan(barcode)
             product = packaging.product_id
-        if product and move_line.product_id == product:
-            quantity += packaging.qty or 1.0
-            response = self._response_for_scan_destination(move_line, qty_done=quantity)
-            return response
+        if product:
+            if move_line.product_id == product:
+                quantity += packaging.qty or 1.0
+                response = self._response_for_scan_destination(
+                    move_line, qty_done=quantity
+                )
+                return response
+            return self._response_for_scan_destination(
+                move_line,
+                message=self.msg_store.wrong_record(product),
+                qty_done=quantity,
+            )
         # Handle barcode of a lot
         lot = search.lot_from_scan(barcode)
-        if lot and move_line.lot_id == lot:
-            quantity += 1.0
-            response = self._response_for_scan_destination(move_line, qty_done=quantity)
-            return response
+        if lot:
+            if move_line.lot_id == lot:
+                quantity += 1.0
+                response = self._response_for_scan_destination(
+                    move_line, qty_done=quantity
+                )
+                return response
+            return self._response_for_scan_destination(
+                move_line,
+                message=self.msg_store.wrong_record(lot),
+                qty_done=quantity,
+            )
         return response
 
     def scan_destination_pack(self, picking_batch_id, move_line_id, barcode, quantity):

odoo/addons/shopfloor/services/zone_picking.py

@@ -894,29 +894,25 @@ class ZonePicking(Component):
             base_response=response, message=self.msg_store.barcode_not_found()
         )
 
-    def _set_destination_location(
+    def _check_set_destination_location(
         self, move_line, package, quantity, confirmation, location, barcode
     ):
-        location_changed = False
-        response = None
-
         # A valid location is a sub-location of the original destination, or a
         # any sub-location of the picking type's default destination location
         # if `confirmation is equal to the barcode scanned.
         # Ask confirmation to the user if the scanned location is not in the
         # expected ones but is valid (in picking type's default destination)
         if not self.is_dest_location_valid(move_line.move_id, location):
-            response = self._response_for_set_line_destination(
+            return self._response_for_set_line_destination(
                 move_line,
                 message=self.msg_store.dest_location_not_allowed(),
                 qty_done=quantity,
             )
-            return (location_changed, response)
 
         if confirmation != barcode and self.is_dest_location_to_confirm(
             move_line.location_dest_id, location
         ):
-            response = self._response_for_set_line_destination(
+            return self._response_for_set_line_destination(
                 move_line,
                 message=self.msg_store.confirm_location_changed(
                     move_line.location_dest_id, location
@@ -924,15 +920,23 @@ class ZonePicking(Component):
                 confirmation_required=barcode,
                 qty_done=quantity,
             )
-            return (location_changed, response)
 
         # If no destination package
         if self._packing_required() and not move_line.result_package_id:
-            response = self._response_for_set_line_destination(
+            return self._response_for_set_line_destination(
                 move_line,
                 message=self.msg_store.dest_package_required(),
                 qty_done=quantity,
             )
+
+    def _set_destination_location(
+        self, move_line, package, quantity, confirmation, location, barcode
+    ):
+        location_changed = False
+        response = self._check_set_destination_location(
+            move_line, package, quantity, confirmation, location, barcode
+        )
+        if response:
             return (location_changed, response)
         # destination location set to the scanned one
 

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

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:86239aacdfa7d7810aca5b0625ebd9112b12385d98899ac696d596b455b0c57d
+!! source digest: sha256:15590a835f281c13f0eae031c50d19d04ab77e94ee95b697d5eabd04373c21ce
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/licence-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/addons/shopfloor/tests/test_cluster_picking_scan_destination_no_prefill_qty.py

@@ -1,4 +1,5 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
+# Copyright 2024 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from .test_cluster_picking_base import ClusterPickingCommonCase
@@ -78,15 +79,16 @@ class ClusterPickingScanDestinationPackPrefillQtyCase(ClusterPickingCommonCase):
         )
         # Ensure the qty has not changed.
         self.assertEqual(line.qty_done, previous_qty_done)
-
+        new_move_line = self.env["stock.move.line"].search(
+            [("move_id", "=", line.move_id.id), ("id", ">", line.id)]
+        )
+        self.assertFalse(new_move_line)
         expected_qty_done = qty_done
         self.assert_response(
             response,
             next_state="scan_destination",
             data=self._line_data(line, qty_done=expected_qty_done),
-            message=self.service.msg_store.bin_not_found_for_barcode(
-                self.product_b.barcode
-            ),
+            message=self.service.msg_store.wrong_record(self.product_b),
         )
 
     def test_scan_destination_pack_increment_with_packaging(self):

{odoo_addon_shopfloor-16.0.2.5.0.2.dist-info → odoo_addon_shopfloor-16.0.2.6.0.dist-info}/METADATA

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

{odoo_addon_shopfloor-16.0.2.5.0.2.dist-info → odoo_addon_shopfloor-16.0.2.6.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/shopfloor/README.rst,sha256=ABVzU954zlAGxtjdMbnky8zuB3EvFs29Q2cyxBfRYB8,5318
+odoo/addons/shopfloor/README.rst,sha256=3hKplmB-AMWU6_RI_K4a0RgPmBljXpwkJiI3h-egmbg,5318
 odoo/addons/shopfloor/__init__.py,sha256=ke3RmZ7XkX-lz4S8NHAxNIEJ5_Nvj5bjBAqD-W-q73c,91
-odoo/addons/shopfloor/__manifest__.py,sha256=pVpAMjaFsljMLhAcIlbsTkgoN1WoPPMGTAQl6i_OhV0,2245
+odoo/addons/shopfloor/__manifest__.py,sha256=P0iMMOUCqm10sQWbhO2ukoDxBb5DQqsnEBeZ9kyY6wk,2245
 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
@@ -74,18 +74,18 @@ odoo/addons/shopfloor/readme/USAGE.rst,sha256=6Of9b6ec7gH1SKhdpBIaavsON0JWBFAzhb
 odoo/addons/shopfloor/security/groups.xml,sha256=hdLqRUZM_4RQnleinRYhxDxqW4VOI5li4oTsB7m96LQ,578
 odoo/addons/shopfloor/services/__init__.py,sha256=4lhF0VNx8QosVEZj9QJYgv6oWD0kl9FX80rL5WMrXf4,303
 odoo/addons/shopfloor/services/checkout.py,sha256=GbkSbmpgYzdBhYw-k2iqCHUHr9P5sJJDKkxddqmcR0k,79693
-odoo/addons/shopfloor/services/cluster_picking.py,sha256=v3UduBo5iIUW85nP7JtNFAsFr3LmePvGSK-DXvn_WYI,68221
+odoo/addons/shopfloor/services/cluster_picking.py,sha256=lpAzEDtByYSgZCkZvScYKULe8hlsliZH9A1UMQAd5mw,68729
 odoo/addons/shopfloor/services/delivery.py,sha256=ko2xre3q-P2LaGd4CMKFWJoavk9QXTI8WKXghf8PoL0,33226
 odoo/addons/shopfloor/services/location_content_transfer.py,sha256=gn-8W_u2tFT-A69Cot8B6CKG6pFB_21EjC2MYisfDME,49472
 odoo/addons/shopfloor/services/menu.py,sha256=m1eNOReTda_xD-p-m8k2Pn5cJQOLWTiaBGW46zxsYsk,2354
 odoo/addons/shopfloor/services/picking_batch.py,sha256=w51R5HHkQxCHle72k28VetXKfIRRh5GTaEXv6mhikvQ,4649
 odoo/addons/shopfloor/services/service.py,sha256=HuxZZQ5MxnvDtr89HWQW2muuPvEF4vjI9ArdSFeAxg8,4882
 odoo/addons/shopfloor/services/single_pack_transfer.py,sha256=S9zZ027fclqUBvqqFHMnD1QcbUb_dYyCtWs1E4pOAV4,16120
-odoo/addons/shopfloor/services/zone_picking.py,sha256=9JMZNhSiwkw1DWIrBj1dquM-i1NaMzDdqbI_wuTgRjw,83806
+odoo/addons/shopfloor/services/zone_picking.py,sha256=I_yZOR4Xn5loWTQi6Nm65PTb2ARzZNHk7LoU4GdiaUA,83960
 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=xtpdUahpJbHpGpJkDST1F39sl_EFXdNA0H7FPcF1kfI,17547
+odoo/addons/shopfloor/static/description/index.html,sha256=yVSAuJbZ8QPag5I_C6Xor2gc60BwinBqMaI1M8vjvgQ,17547
 odoo/addons/shopfloor/tests/__init__.py,sha256=4WHuLVjOX_lndDJyuyGcreNckArFJL2HA5PPFlhT6FM,3962
 odoo/addons/shopfloor/tests/common.py,sha256=v1C7DQT-MvTk81xIYyv--c1BaIpwbia2ey8s35nvrK4,11611
 odoo/addons/shopfloor/tests/models.py,sha256=jNbYUqYLxkbQMn4j8bejHM3l6CRThJBDfpATl8H83OM,939
@@ -123,7 +123,7 @@ odoo/addons/shopfloor/tests/test_cluster_picking_batch.py,sha256=uqNDKYFi2T8fwdW
 odoo/addons/shopfloor/tests/test_cluster_picking_change_pack_lot.py,sha256=S2fUP545A3TO6xWYFyHvDi4sNnb4UgyTNghUfbQ_TZw,4157
 odoo/addons/shopfloor/tests/test_cluster_picking_is_zero.py,sha256=VsNhviyfg6uRA6dM6Sv2H2TNBA7_RjEnoJWtvQ9SkHw,3496
 odoo/addons/shopfloor/tests/test_cluster_picking_scan_destination.py,sha256=ypirEJupF_sdn-nUxXfG2SCkS9LLb8dheYQHCxEbP8k,14381
-odoo/addons/shopfloor/tests/test_cluster_picking_scan_destination_no_prefill_qty.py,sha256=XthQeJ2RotcwglQseheeaHOuVl-q28Efo0oMy8k3byc,4267
+odoo/addons/shopfloor/tests/test_cluster_picking_scan_destination_no_prefill_qty.py,sha256=hboVxHXNFqZ0DDTBqUBW9r6Dq428Vq5uj7fgaGIdPAg,4464
 odoo/addons/shopfloor/tests/test_cluster_picking_scan_line.py,sha256=urAU4AhLX-GCcXqpJEG-mbiy63lXwzbtf4J5jZ-IiaA,15410
 odoo/addons/shopfloor/tests/test_cluster_picking_scan_line_location_or_pack_first.py,sha256=Gsqq0vOjCg14G5ABk9KbVdZpqYX8SHCzhh-JxuOI0Nk,4440
 odoo/addons/shopfloor/tests/test_cluster_picking_scan_line_no_prefill_qty.py,sha256=xf2QXXovehcbvmuTek20qbDP4gUiLgPpw8XkFNN3Cds,2905
@@ -187,7 +187,7 @@ odoo/addons/shopfloor/views/shopfloor_menu.xml,sha256=gepRIcpP6xuYypagEfpJm1s9-A
 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.5.0.2.dist-info/METADATA,sha256=ZMWUTGGoxrEM_NBWB11m3hT3xEetTLh0HOxDDxQpz50,6763
-odoo_addon_shopfloor-16.0.2.5.0.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-odoo_addon_shopfloor-16.0.2.5.0.2.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_shopfloor-16.0.2.5.0.2.dist-info/RECORD,,
+odoo_addon_shopfloor-16.0.2.6.0.dist-info/METADATA,sha256=swGnD-kWIlO0frhPKg_ipcDLFQ9oIvLMCpqq7WfWCBA,6761
+odoo_addon_shopfloor-16.0.2.6.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+odoo_addon_shopfloor-16.0.2.6.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_shopfloor-16.0.2.6.0.dist-info/RECORD,,