odoo-addon-shopfloor 16.0.2.2.1.6__py3-none-any.whl → 16.0.2.3.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:bb5933746c40b25c45fcadac4704a1a752a86c48bb857969ca935196736d24c6
+   !! source digest: sha256:4c4dc0050165bd957675ce9d57514bb2868133060d042e37d9ef7cba29c9fd6b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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.2.1",
+    "version": "16.0.2.3.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/wms",

odoo/addons/shopfloor/actions/data_detail.py

@@ -1,5 +1,7 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from collections import defaultdict
+
 from odoo.tools.float_utils import float_round
 
 from odoo.addons.component.core import Component
@@ -24,12 +26,47 @@ class DataDetailAction(Component):
     def _location_detail_parser(self):
         return self._location_parser + [
             "complete_name",
+            (
+                "quant_ids:products",
+                lambda record, fname: self._location_content(record),
+            ),
             (
                 "reserved_move_line_ids:reserved_move_lines",
                 lambda record, fname: self.move_lines(record[fname]),
             ),
         ]
 
+    def _location_content(self, record):
+        res = []
+        product_qties = defaultdict(lambda: defaultdict(lambda: 0))
+        for quant in record.quant_ids:
+            product_qties[quant.product_id][quant.lot_id] += quant.quantity
+        for product, quants_qty in product_qties.items():
+            val = self.product(product)
+            lots = []
+            val["lots"] = lots
+            qty_total = 0
+            for lot, qty in quants_qty.items():
+                qty_total += qty
+                if not lot:
+                    continue
+                lot_val = self._location_lot(lot)
+                lot_val["quantity"] = qty
+                lots.append(lot_val)
+            val["quantity"] = qty_total
+            res.append(val)
+        return res
+
+    def _location_lot(self, record, **kw):
+        # Define a new method to not overload the base one which is used in many places
+        return self._jsonify(record, self._location_lot_detail_parser, **kw)
+
+    @property
+    def _location_lot_detail_parser(self):
+        return self._lot_parser + [
+            "removal_date",
+        ]
+
     @ensure_model("stock.picking")
     def picking_detail(self, record, **kw):
         parser = self._picking_detail_parser
@@ -92,7 +129,6 @@ class DataDetailAction(Component):
     def _lot_detail_parser(self):
         return self._lot_parser + [
             "removal_date",
-            "expiration_date:expire_date",
             (
                 "product_id:product",
                 lambda record, fname: self.product_detail(record[fname]),
@@ -131,6 +167,10 @@ class DataDetailAction(Component):
     def _product_detail_parser(self):
         return self._product_parser + [
             ("image_128:image", self._product_image_url),
+            (
+                "stock_quant_ids:locations",
+                lambda record, fname: self._locations_for_product(record),
+            ),
             (
                 "product_tmpl_id:manufacturer",
                 lambda rec, fname: self._jsonify(
@@ -139,6 +179,36 @@ class DataDetailAction(Component):
             ),
         ]
 
+    def _get_product_locations(self, record):
+        # Retrieve all products -- maybe more than one location
+        product_template = record.product_tmpl_id
+        products = product_template.product_variant_ids
+        quants = self.env["stock.quant"].search(
+            [("product_id", "in", products.ids), ("location_id.usage", "=", "internal")]
+        )
+        return quants.location_id
+
+    def _locations_for_product(self, record):
+        res = []
+        for location in self._get_product_locations(record):
+            quants = location.quant_ids.filtered(lambda q: q.product_id == record)
+            loc = self.location(location)
+            loc["complete_name"] = location.complete_name
+            loc["quantity"] = sum(quants.mapped("quantity"))
+            lots = []
+            quants_lot_qty = defaultdict(lambda: 0)
+            for quant in quants:
+                quants_lot_qty[quant.lot_id] += quant.quantity
+            for lot, qty in quants_lot_qty.items():
+                if not lot:
+                    continue
+                lot_val = self._location_lot(lot)
+                lot_val["quantity"] = qty
+                lots.append(lot_val)
+            loc["lots"] = lots
+            res.append(loc)
+        return res
+
     def _product_image_url(self, record, field_name):
         if not record[field_name]:
             return None

odoo/addons/shopfloor/actions/schema_detail.py

@@ -16,6 +16,27 @@ class ShopfloorSchemaDetailAction(Component):
                     "required": True,
                 },
                 "reserved_move_lines": self._schema_list_of(self.move_line()),
+                "products": self._schema_list_of(self.location_product()),
+            }
+        )
+        return schema
+
+    def location_product(self):
+        schema = self.product()
+        schema.update(
+            {
+                "quantity": {"type": "float", "required": True},
+                "lots": self._schema_list_of(self.location_lot()),
+            }
+        )
+        return schema
+
+    def location_lot(self):
+        schema = self.lot()
+        schema.update(
+            {
+                "removal_date": {"type": "string", "nullable": True, "required": False},
+                "quantity": {"type": "float", "required": True},
             }
         )
         return schema
@@ -76,6 +97,22 @@ class ShopfloorSchemaDetailAction(Component):
                 "image": {"type": "string", "nullable": True, "required": False},
                 "manufacturer": self._schema_dict_of(self._simple_record()),
                 "suppliers": self._schema_list_of(self.product_supplierinfo()),
+                "locations": self._schema_list_of(self.product_location()),
+            }
+        )
+        return schema
+
+    def product_location(self):
+        schema = self.location()
+        schema.update(
+            {
+                "complete_name": {
+                    "type": "string",
+                    "nullable": False,
+                    "required": True,
+                },
+                "quantity": {"type": "float", "required": True},
+                "lots": self._schema_list_of(self.location_lot()),
             }
         )
         return schema

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:bb5933746c40b25c45fcadac4704a1a752a86c48bb857969ca935196736d24c6
+!! source digest: sha256:4c4dc0050165bd957675ce9d57514bb2868133060d042e37d9ef7cba29c9fd6b
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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_actions_data_base.py

@@ -1,5 +1,7 @@
 # Copyright 2020 Camptocamp SA (http://www.camptocamp.com)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from collections import defaultdict
+
 from odoo.tools.float_utils import float_round
 
 from odoo.addons.shopfloor_base.tests.common_misc import ActionsDataTestMixin
@@ -181,6 +183,16 @@ class ActionsDataCaseBase(CommonCase, ActionsDataTestMixin):
         data.update(kw)
         return data
 
+    def _expected_lot(self, record, **kw):
+        data = {
+            "id": record.id,
+            "name": record.name,
+            "ref": record.ref or None,
+            "expiration_date": record.expiration_date or None,
+        }
+        data.update(kw)
+        return data
+
 
 class ActionsDataDetailCaseBase(ActionsDataCaseBase):
     @classmethod
@@ -206,6 +218,16 @@ class ActionsDataDetailCaseBase(ActionsDataCaseBase):
                 "reserved_move_lines": self.data_detail.move_lines(
                     kw.get("move_lines", [])
                 ),
+                "products": self.data_detail._location_content(record),
+            }
+        )
+
+    def _expected_location_lot(self, record, **kw):
+        return dict(
+            **self._expected_lot(record),
+            **{
+                "removal_date": record.removal_date or None,
+                "quantity": sum(record.quant_ids.mapped("quantity")),
             }
         )
 
@@ -215,16 +237,35 @@ class ActionsDataDetailCaseBase(ActionsDataCaseBase):
             record.qty_available - record.free_qty,
             precision_rounding=record.uom_id.rounding,
         )
+        locations = self.data_detail._get_product_locations(record)
         detail = {
             "qty_available": qty_available,
             "qty_reserved": qty_reserved,
         }
+        locations_info = []
+        for location in locations:
+            quants = location.quant_ids.filtered(lambda q: q.product_id == record)
+            loc = self._expected_location(location)
+            loc["complete_name"] = location.complete_name
+            loc["quantity"] = sum(quants.mapped("quantity"))
+            loc["lots"] = []
+            quants_lot_qty = defaultdict(lambda: 0)
+            for quant in quants:
+                quants_lot_qty[quant.lot_id] += quant.quantity
+            for lot, qty in quants_lot_qty.items():
+                if not lot:
+                    continue
+                lot_val = self._expected_location_lot(lot)
+                lot_val["quantity"] = qty
+                loc["lots"].append(lot_val)
+            locations_info.append(loc)
         if kw.get("full"):
             detail.update(
                 {
                     "image": "/web/image/product.product/{}/image_128".format(record.id)
                     if record.image_128
                     else None,
+                    "locations": locations_info,
                     "manufacturer": {
                         "id": record.manufacturer_id.id,
                         "name": record.manufacturer_id.name,

odoo/addons/shopfloor/tests/test_actions_data_detail.py

@@ -56,11 +56,12 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "name": lot.name,
             "ref": "#FOO",
             "expiration_date": "2020-05-31T00:00:00",
+            "removal_date": "2020-05-20T00:00:00",
             "product": self._expected_product_detail(self.product_b, full=True),
         }
         # ignore time and TZ, we don't care here
-        self.assertEqual(data.pop("removal_date").split("T")[0], "2020-05-20")
-        self.assertEqual(data.pop("expire_date").split("T")[0], "2020-05-31")
+        self.assertEqual(data.get("removal_date", "").split("T")[0], "2020-05-20")
+        self.assertEqual(data.get("expiration_date", "").split("T")[0], "2020-05-31")
         self.assertDictEqual(data, expected)
 
     def test_data_package(self):

{odoo_addon_shopfloor-16.0.2.2.1.6.dist-info → odoo_addon_shopfloor-16.0.2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-shopfloor
-Version: 16.0.2.2.1.6
+Version: 16.0.2.3.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:bb5933746c40b25c45fcadac4704a1a752a86c48bb857969ca935196736d24c6
+   !! source digest: sha256:4c4dc0050165bd957675ce9d57514bb2868133060d042e37d9ef7cba29c9fd6b
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_shopfloor-16.0.2.2.1.6.dist-info → odoo_addon_shopfloor-16.0.2.3.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
-odoo/addons/shopfloor/README.rst,sha256=1U0h74Cav3zjs92LORr6T9iXjU9F3zMclHtjAWm2uMc,5318
+odoo/addons/shopfloor/README.rst,sha256=igj3JCBBGe9PVg72B3IpVRw7sJOj7cwqPPl3ZZSbV48,5318
 odoo/addons/shopfloor/__init__.py,sha256=ke3RmZ7XkX-lz4S8NHAxNIEJ5_Nvj5bjBAqD-W-q73c,91
-odoo/addons/shopfloor/__manifest__.py,sha256=uEOzWTHkQpWsYE52kY7ygBYjYF5x5pgXHFhKitDJv9c,2245
+odoo/addons/shopfloor/__manifest__.py,sha256=A2L2IIHDaRHyEFyHu-m-r6_fqdO4z1viAx73eiFzc_s,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
 odoo/addons/shopfloor/actions/change_package_lot.py,sha256=-MFk9G5vKJqWwaNYs9BSv4LHprbTLXE9xvRBNpfvFmo,6729
 odoo/addons/shopfloor/actions/completion_info.py,sha256=Q_wlx8VJHOPFZbwGrxHBYa-gt04ZAXBsRBGh0aLuRrk,1483
 odoo/addons/shopfloor/actions/data.py,sha256=ASj6VdLrkzJD6jTWsbKQ4LNZ_x2NU4BaXH_FA9RJvJQ,12846
-odoo/addons/shopfloor/actions/data_detail.py,sha256=m46sLSuQmxt5NHBoV1GNKsSmc26EHv-OFoMZ0Qz8l9E,6104
+odoo/addons/shopfloor/actions/data_detail.py,sha256=eVW5oOpl5Tkwkpb0he0Xj_PHLRS8LkOa5VOI2w5R2Zo,8752
 odoo/addons/shopfloor/actions/inventory.py,sha256=Slg1hcV-kMb1jWHHu0VmYvQ9C0uqXtUAwAmHJUTE1zo,5976
 odoo/addons/shopfloor/actions/location_content_transfer_sorter.py,sha256=xpzea-w4zFrmpudQK3omRpZVhJdEIVQLXnuImkaZf5A,3110
 odoo/addons/shopfloor/actions/message.py,sha256=x12GUAQGq3HWOvf5D4D94NoIo_M9cARo0R6fiH1lKno,29956
@@ -15,7 +15,7 @@ odoo/addons/shopfloor/actions/move_line_search.py,sha256=Xhhx9RHaawNpa31DIgA8Q-c
 odoo/addons/shopfloor/actions/packaging.py,sha256=uZxD1bisNS_8M5ZQAHuOz2MR6l26XHR4VZY7QgA69Zs,2662
 odoo/addons/shopfloor/actions/savepoint.py,sha256=Tmqgh1k16x7L0ZSxVz9yNqIGLAyA7vFb5FWpLrb_GTI,1151
 odoo/addons/shopfloor/actions/schema.py,sha256=r7CLlzmcHRcaKL0_qQBUeMiDrxbIwYfQB_Ydq867JtU,8556
-odoo/addons/shopfloor/actions/schema_detail.py,sha256=7-e5tPLHKgNTamUy0tvWVsjhYHTP0pTzEP4BeZD2Bm8,3793
+odoo/addons/shopfloor/actions/schema_detail.py,sha256=_xtm8ptRXAPBIMTyr8XKMQtogcjBudh-QRqKUZEEHGU,4968
 odoo/addons/shopfloor/actions/search.py,sha256=ai-pLBLWiDjKYlZ2uWZQG6PeB2jBj5-1D34XjELaXMY,6851
 odoo/addons/shopfloor/actions/stock.py,sha256=_m8b9u6V1P47G15RHw1JN4nLLy8N8bPlpe7Ip0QUpEs,10758
 odoo/addons/shopfloor/actions/stock_unreserve.py,sha256=LoFd9hzeNlTQEn0-FN3N4xWLSo1uuiw5E394OEPHm-Y,2720
@@ -84,14 +84,14 @@ odoo/addons/shopfloor/services/zone_picking.py,sha256=H6cA3NAHhxq3uUuwsCjep723fU
 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=HEzd-EovG45y9j9WQixsl1TJCApIrkIEk8wyFu-OFC8,17547
+odoo/addons/shopfloor/static/description/index.html,sha256=8N6zktuYYLeo0GK8epzFHAyjez1OTy4iwgBGr7hYokI,17547
 odoo/addons/shopfloor/tests/__init__.py,sha256=G9IP98Vs4Vx26FYbaxQcJST7xU7gjUggxTEiy8DPCMI,3902
 odoo/addons/shopfloor/tests/common.py,sha256=v1C7DQT-MvTk81xIYyv--c1BaIpwbia2ey8s35nvrK4,11611
 odoo/addons/shopfloor/tests/models.py,sha256=jNbYUqYLxkbQMn4j8bejHM3l6CRThJBDfpATl8H83OM,939
 odoo/addons/shopfloor/tests/test_actions_change_package_lot.py,sha256=iWtTEbIKKrwqvoCUyfuaq1jAtnrW3DP8BQ1xEdZk9t4,46829
 odoo/addons/shopfloor/tests/test_actions_data.py,sha256=pHuabdpTGbbvh7KSam-slLuwdIxLPy4JqZR0iLA9W4U,16514
-odoo/addons/shopfloor/tests/test_actions_data_base.py,sha256=vPhMBZ5xOKlY8So49PCLuxwqzRGo_GrRfZzcuwSHX4A,8920
-odoo/addons/shopfloor/tests/test_actions_data_detail.py,sha256=_bPJRbRVqisA7reXqrleXGfqtMb0Uq7ntakVn4C2T_Y,14016
+odoo/addons/shopfloor/tests/test_actions_data_base.py,sha256=bstdEhLIwOTOzQNUrIs-M7lnPdWQ5AILIDn-cXqC4xM,10499
+odoo/addons/shopfloor/tests/test_actions_data_detail.py,sha256=0eHM8z1kka0FhGMcDk-Rc8hQNvHlivNzWQEMOnZH-9A,14079
 odoo/addons/shopfloor/tests/test_actions_packaging.py,sha256=viofwEFk4aqn2tNaQGz2gGvBH6XoY25c6fO0a0uU448,1616
 odoo/addons/shopfloor/tests/test_actions_search.py,sha256=lQo4G1PRG0iiFD832-H7wDuuSgQR-iNkYmdWk0H-tBk,9139
 odoo/addons/shopfloor/tests/test_actions_search_move_line.py,sha256=ys7Y0mGdg3LNs8l1x8WCx8I_Qb9xsU9XAXOGPKuWv48,5783
@@ -185,7 +185,7 @@ odoo/addons/shopfloor/views/shopfloor_menu.xml,sha256=zAKIIMnglUsRnfvusKjKsRaZdQ
 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.2.1.6.dist-info/METADATA,sha256=lrY2dwiv0TZ-4OUAgoOcao-0DUY9JTOG15lCqkdI9Z4,6763
-odoo_addon_shopfloor-16.0.2.2.1.6.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-odoo_addon_shopfloor-16.0.2.2.1.6.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_shopfloor-16.0.2.2.1.6.dist-info/RECORD,,
+odoo_addon_shopfloor-16.0.2.3.0.dist-info/METADATA,sha256=8wNWLnsyzRVU0_S0XBk0pnvMQgXH3gFvnXuEsZy3w5M,6761
+odoo_addon_shopfloor-16.0.2.3.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+odoo_addon_shopfloor-16.0.2.3.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_shopfloor-16.0.2.3.0.dist-info/RECORD,,