odoo-addon-shopfloor 18.0.0.6.0.2__py3-none-any.whl → 18.0.0.7.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:63709bb5049a329746f85dcd55988b47e5e77d8a3be50ced7fc3768892762c22
+   !! source digest: sha256:ca49f8a6cee2bf4a565b75f59d5df7e7cb1ae0085216eb934d53dbb2442de969
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |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": "18.0.0.6.0",
+    "version": "18.0.0.7.0",
     "development_status": "Beta",
     "category": "Inventory",
     "website": "https://github.com/OCA/stock-logistics-shopfloor",

odoo/addons/shopfloor/services/location_content_transfer.py

@@ -186,7 +186,7 @@ class LocationContentTransfer(Component):
             self._domain_recover_pickings()
         )
         started_pickings = candidate_pickings.filtered(
-            lambda picking: any(line.qty_done for line in picking.move_line_ids)
+            lambda picking: any(line.picked for line in picking.move_line_ids)
         )
         return started_pickings
 
@@ -416,8 +416,7 @@ class LocationContentTransfer(Component):
         return [
             ("location_id", "=", location.id),
             ("state", "in", ("assigned", "partially_available")),
-            ("qty_done", ">", 0),
-            # TODO check generated SQL
+            ("picked", "=", True),
             ("picking_id.user_id", "=", self.env.uid),
         ]
 
@@ -431,7 +430,7 @@ class LocationContentTransfer(Component):
     # hook used in module shopfloor_checkout_sync
     def _write_destination_on_lines(self, lines, location):
         lines.location_dest_id = location
-        lines.package_level_id.picking_id.location_dest_id = location
+        lines.package_level_id.location_dest_id = location
 
     def _set_all_destination_lines_and_done(self, pickings, move_lines, dest_location):
         self._write_destination_on_lines(move_lines, dest_location)
@@ -762,7 +761,7 @@ class LocationContentTransfer(Component):
 
         self._lock_lines(move_line)
 
-        move_line.qty_done = quantity
+        move_line.qty_picked = quantity
         self._write_destination_on_lines(move_line, scanned_location)
 
         stock = self._actions_for("stock")
@@ -770,7 +769,7 @@ class LocationContentTransfer(Component):
         backorders = stock.validate_moves(move_line.move_id)
         if backorders:
             for move_line in backorders.mapped("move_line_ids"):
-                move_line.qty_done = move_line.quantity
+                move_line.picked = True
             backorders.user_id = self.env.user
             # process first backorder of current line
             move_lines = backorders.move_line_ids
@@ -858,9 +857,8 @@ class LocationContentTransfer(Component):
             # split the move to process only the lines related to the package.
             package_move.split_other_move_lines(package_move_lines)
             lot = package_move.move_line_ids.lot_id
-            # We need to set qty_done at 0 because otherwise
-            # the move_line will not be deleted
-            package_move.move_line_ids.write({"qty_done": 0})
+            # We need to unpick the line because otherwise it won't be deleted
+            package_move.move_line_ids.picked = False
             package = package_level.package_id
             if (
                 self.is_allow_move_create()
@@ -912,9 +910,8 @@ class LocationContentTransfer(Component):
         move = move_line.move_id
         package = move_line.package_id
         lot = move_line.lot_id
-        # We need to set qty_done at 0 because otherwise
-        # the move_line will not be deleted
-        move_line.qty_done = 0
+        # We need to unpick the line because otherwise it won't be deleted
+        move_line.picked = False
         if self.is_allow_move_create() and self.env.user == move.picking_id.create_uid:
             # Owned by the user deleting the move
             move._action_cancel()
@@ -1072,7 +1069,7 @@ class ShopfloorLocationContentTransferValidatorResponse(Component):
         """
         return {
             "start": {},
-            "scan_location": {},
+            "scan_location": self._schema_scan_location,
             "get_work": {},
             "scan_destination_all": self._schema_all,
             "start_single": self._schema_single,
@@ -1111,6 +1108,15 @@ class ShopfloorLocationContentTransferValidatorResponse(Component):
             },
         }
 
+    @property
+    def _schema_scan_location(self):
+        return {
+            "location": self.schemas._schema_dict_of(
+                self.schemas.location(),
+                required=False,
+            ),
+        }
+
     def start_or_recover(self):
         return self._response_schema(
             next_states={
@@ -1205,3 +1211,16 @@ class ShopfloorLocationContentTransferValidatorResponse(Component):
         return self._response_schema(
             next_states={"scan_location", "get_work", "start_single"}
         )
+
+    def cancel_work(self):
+        return self._response_schema(next_states={"scan_location", "get_work"})
+
+    def find_work(self):
+        return self._response_schema(
+            next_states={
+                "scan_location",
+                "get_work",
+                "scan_destination_all",
+                "start_single",
+            }
+        )

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:63709bb5049a329746f85dcd55988b47e5e77d8a3be50ced7fc3768892762c22
+!! source digest: sha256:ca49f8a6cee2bf4a565b75f59d5df7e7cb1ae0085216eb934d53dbb2442de969
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/stock-logistics-shopfloor/tree/18.0/shopfloor"><img alt="OCA/stock-logistics-shopfloor" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--shopfloor-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/stock-logistics-shopfloor-18-0/stock-logistics-shopfloor-18-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/stock-logistics-shopfloor&amp;target_branch=18.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

odoo/addons/shopfloor/tests/__init__.py

@@ -54,16 +54,15 @@ from . import test_delivery_set_qty_done_line
 from . import test_delivery_sublocation
 from . import test_delivery_list_stock_picking
 from . import test_delivery_select
-
-# from . import test_location_content_transfer_base
-# from . import test_location_content_transfer_start
-# from . import test_location_content_transfer_get_work
-# from . import test_location_content_transfer_set_destination_all
-# from . import test_location_content_transfer_scan_location
-# from . import test_location_content_transfer_single
-# from . import test_location_content_transfer_set_destination_package_or_line
-# from . import test_location_content_transfer_putaway
-# from . import test_location_content_transfer_mix
+from . import test_location_content_transfer_base
+from . import test_location_content_transfer_start
+from . import test_location_content_transfer_get_work
+from . import test_location_content_transfer_set_destination_all
+from . import test_location_content_transfer_scan_location
+from . import test_location_content_transfer_single
+from . import test_location_content_transfer_set_destination_package_or_line
+from . import test_location_content_transfer_putaway
+from . import test_location_content_transfer_mix
 from . import test_zone_picking_base
 from . import test_zone_picking_complete_mix_pack_flux
 from . import test_zone_picking_start

odoo/addons/shopfloor/tests/test_actions_data.py

@@ -178,11 +178,14 @@ class ActionsDataCase(ActionsDataCaseBase):
             "partner": {"id": self.customer.id, "name": self.customer.name},
             "carrier": {"id": carrier.id, "name": carrier.name},
             "ship_carrier": None,
-            "progress": 100.0,
+            "progress": 0.0,
             "priority": "0",
         }
         self.assertEqual(data.pop("scheduled_date").split("T")[0], "2020-08-03")
         self.assertDictEqual(data, expected)
+        self.picking.move_line_ids[0].picked = True
+        data = self.data.picking(self.picking, with_progress=True)
+        self.assertEqual(data.pop("progress"), 25.0)
 
     def test_data_product(self):
         (

odoo/addons/shopfloor/tests/test_actions_data_detail.py

@@ -148,7 +148,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
                 "carrier_id": carrier.id,
             }
         )
-        picking.move_ids[0].quantity = 5.0
+        picking.move_line_ids[0].qty_picked = 5.0
         picking.move_ids.write({"date": "2020-05-13"})
         data = self.data_detail.picking_detail(picking, with_progress=True)
         self.assert_schema(self.schema_detail.picking_detail(), data)
@@ -161,7 +161,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             "note": Markup("<p>read me</p>"),
             "origin": "created by test",
             "ship_carrier": None,
-            "weight": 100.0,
+            "weight": picking.weight,
             "partner": {"id": self.customer.id, "name": self.customer.name},
             "carrier": {"id": picking.carrier_id.id, "name": picking.carrier_id.name},
             "priority": "Urgent",
@@ -171,7 +171,7 @@ class TestActionsDataDetailCase(ActionsDataDetailCaseBase):
             },
             "move_lines": self.data_detail.move_lines(picking.move_line_ids),
             "picking_type_code": "outgoing",
-            "progress": 87.5,
+            "progress": 12.5,
         }
         self.assertEqual(data.pop("scheduled_date").split("T")[0], "2020-05-13")
         self.assertDictEqual(data, expected)

odoo/addons/shopfloor/tests/test_location_content_transfer_base.py

@@ -89,12 +89,11 @@ class LocationContentTransferCommonCase(CommonCase):
         It means a user scanned the location with the pickings. They are:
 
         * assigned to the user
-        * the qty_done of all their move lines is set to they reserved qty
+        * all reserved qty are picked
 
         """
         pickings.user_id = cls.env.uid
-        for line in pickings.mapped("move_line_ids"):
-            line.qty_done = line.quantity
+        pickings.move_line_ids.picked = True
 
     def assert_response_start(self, response, message=None, popup=None):
         self.assert_response(

odoo/addons/shopfloor/tests/test_location_content_transfer_get_work.py

@@ -23,7 +23,7 @@ class TestLocationContentTransferGetWork(LocationContentTransferCommonCase):
             [("location_id", "=", cls.stock_location.id)]
         )
         cls.move_lines = cls.pickings.move_line_ids.filtered(
-            lambda line: line.qty_done == 0
+            lambda line: not line.picked
             and line.state in ("assigned", "partially_available")
             and not line.shopfloor_user_id
         )

odoo/addons/shopfloor/tests/test_location_content_transfer_mix.py

@@ -80,13 +80,39 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
                 "warehouse_id": cls.wh.id,
                 "picking_type_id": cls.wh.out_type_id.id,
                 "procure_method": "make_to_order",
-                "state": "draft",
+                "state": "waiting",
             }
         )
-        cls.ship_move_a._assign_picking()
-        cls.ship_move_a._action_confirm()
-        cls.pack_move_a = cls.ship_move_a.move_orig_ids[0]
-        cls.pick_move_a = cls.pack_move_a.move_orig_ids[0]
+        cls.pack_move_a = cls.env["stock.move"].create(
+            {
+                "name": cls.product_a.display_name,
+                "product_id": cls.product_a.id,
+                "product_uom_qty": 10.0,
+                "product_uom": cls.product_a.uom_id.id,
+                "location_id": cls.pack_location.id,
+                "location_dest_id": cls.ship_location.id,
+                "warehouse_id": cls.wh.id,
+                "picking_type_id": cls.wh.pack_type_id.id,
+                "procure_method": "make_to_order",
+                "move_dest_ids": [(4, cls.ship_move_a.id)],
+                "state": "waiting",
+            }
+        )
+        cls.pick_move_a = cls.env["stock.move"].create(
+            {
+                "name": cls.product_a.display_name,
+                "product_id": cls.product_a.id,
+                "product_uom_qty": 10.0,
+                "product_uom": cls.product_a.uom_id.id,
+                "location_id": cls.stock_location.id,
+                "location_dest_id": cls.pack_location.id,
+                "warehouse_id": cls.wh.id,
+                "picking_type_id": cls.wh.pick_type_id.id,
+                "move_dest_ids": [(4, cls.pack_move_a.id)],
+                "state": "confirmed",
+            }
+        )
+        (cls.ship_move_a | cls.pack_move_a | cls.pick_move_a)._assign_picking()
         cls.picking1 = cls.pick_move_a.picking_id
         cls.packing1 = cls.pack_move_a.picking_id
         cls.picking1.action_assign()
@@ -177,7 +203,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
                 )
                 assert response["message"]["message_type"] == "success"
                 assert move_line.state == "done"
-                assert move_line.qty_done == qty
+                assert move_line.qty_picked == qty
         return response
 
     def test_with_zone_picking1(self):
@@ -306,12 +332,12 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
             lambda x: not x.shopfloor_user_id and x.location_id == dest_location1
         )
         self.assertEqual(pack_first_pallet.quantity, 6)
-        self.assertEqual(pack_first_pallet.qty_done, 0)
+        self.assertEqual(pack_first_pallet.qty_picked, 0)
         pack_second_pallet = pack_move_a.move_line_ids.filtered(
             lambda x: not x.shopfloor_user_id and x.location_id == dest_location2
         )
         self.assertEqual(pack_second_pallet.quantity, 4)
-        self.assertEqual(pack_second_pallet.qty_done, 0)
+        self.assertEqual(pack_second_pallet.qty_picked, 0)
         # Operator-2 with the "location content transfer" scenario scan
         # the location where the first pallet is.
         # This pallet/move line will be put in its own transfer as its sibling
@@ -327,7 +353,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
             response_packages[0]["package_src"]["id"], pack_first_pallet.package_id.id
         )
         # Ensure that the second pallet is untouched
-        self.assertEqual(pack_second_pallet.qty_done, 0)
+        self.assertEqual(pack_second_pallet.qty_picked, 0)
         # Operator-3 with the "location content transfer" scenario scan
         # the location where the first pallet is: he should found nothing
         response = self._location_content_transfer_process_line(
@@ -356,11 +382,11 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
                 pack_first_pallet.location_dest_id,
             ),
         )
-        self.assertEqual(pack_first_pallet.qty_done, 6)
+        self.assertEqual(pack_first_pallet.qty_picked, 6)
         self.assertEqual(pack_first_pallet.state, "done")
         self.assertEqual(pack_first_pallet.move_id.product_uom_qty, qty)
         # Ensure that the second pallet is untouched
-        self.assertEqual(pack_second_pallet.qty_done, 0)
+        self.assertEqual(pack_second_pallet.qty_picked, 0)
         # Operator-2 (still with the "location content transfer" scenario) scan
         # the location where the second pallet is
         pack_move_a = pick_move_line2.move_id.move_dest_ids.filtered(
@@ -447,7 +473,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
             lambda x: not x.shopfloor_user_id and x.location_id == dest_location1
         )
         self.assertEqual(pack_first_pallet.quantity, 6)
-        self.assertEqual(pack_first_pallet.qty_done, 0)
+        self.assertEqual(pack_first_pallet.qty_picked, 0)
         # Operator-2 with the "location content transfer" scenario scan
         # the location where the first pallet is.
         # This pallet/move line will be put in its own move and transfer by convenience
@@ -473,7 +499,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
             lambda x: not x.shopfloor_user_id and x.location_id == dest_location2
         )
         self.assertEqual(pack_second_pallet.quantity, 4)
-        self.assertEqual(pack_second_pallet.qty_done, 0)
+        self.assertEqual(pack_second_pallet.qty_picked, 0)
         # The last action has updated the pack operation (new move line) in the
         # transfer previously processed by Operator-2.
         self.assertEqual(original_pack_transfer.state, "assigned")
@@ -492,7 +518,7 @@ class LocationContentTransferMixCase(LocationContentTransferCommonCase):
                 pack_first_pallet.location_dest_id,
             ),
         )
-        self.assertEqual(pack_first_pallet.qty_done, 6)
+        self.assertEqual(pack_first_pallet.qty_picked, 6)
         self.assertEqual(pack_first_pallet.state, "done")
         self.assertEqual(pack_first_pallet.move_id.product_uom_qty, qty)
         # Operator-2 with the "location content transfer" scenario scan

odoo/addons/shopfloor/tests/test_location_content_transfer_set_destination_all.py

@@ -47,10 +47,26 @@ class LocationContentTransferSetDestinationAllCase(LocationContentTransferCommon
         self.assertRecordValues(
             self.pickings.move_line_ids,
             [
-                {"qty_done": 10.0, "state": "done", "location_dest_id": destination.id},
-                {"qty_done": 10.0, "state": "done", "location_dest_id": destination.id},
-                {"qty_done": 10.0, "state": "done", "location_dest_id": destination.id},
-                {"qty_done": 10.0, "state": "done", "location_dest_id": destination.id},
+                {
+                    "qty_picked": 10.0,
+                    "state": "done",
+                    "location_dest_id": destination.id,
+                },
+                {
+                    "qty_picked": 10.0,
+                    "state": "done",
+                    "location_dest_id": destination.id,
+                },
+                {
+                    "qty_picked": 10.0,
+                    "state": "done",
+                    "location_dest_id": destination.id,
+                },
+                {
+                    "qty_picked": 10.0,
+                    "state": "done",
+                    "location_dest_id": destination.id,
+                },
             ],
         )
         self.assertRecordValues(
@@ -91,6 +107,7 @@ class LocationContentTransferSetDestinationAllCase(LocationContentTransferCommon
         the current pickings is validated.
         """
         # Put a partial quantity for 'product_d' to get a partially available move
+        self.picking2.move_line_ids.picked = False
         self.picking2.do_unreserve()
         self._update_qty_in_location(self.content_loc, self.product_d, 5)
         self.picking2.action_assign()
@@ -138,6 +155,7 @@ class LocationContentTransferSetDestinationAllCase(LocationContentTransferCommon
         remaining qties stay in their current picking.
         """
         # Put a partial quantity for 'product_d' to get a partially available move
+        self.picking2.move_line_ids.picked = False
         self.picking2.do_unreserve()
         self._update_qty_in_location(self.content_loc, self.product_d, 5)
         self.picking2.action_assign()

odoo/addons/shopfloor/tests/test_location_content_transfer_set_destination_package_or_line.py

@@ -450,7 +450,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             lambda m: m.product_id == self.product_c
         )
         self.assertEqual(move_line_c.quantity, 10)
-        self.assertEqual(move_line_c.qty_done, 10)
+        self.assertEqual(move_line_c.qty_picked, 10)
         self._simulate_selected_move_line(move_line_c)
         # Scan partial qty (6/10)
         response = self.service.dispatch(
@@ -465,8 +465,8 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         done_picking = original_picking.backorder_ids
         # Check move line data
         self.assertEqual(move_line_c.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line_c.quantity, 0)
-        self.assertEqual(move_line_c.qty_done, 6)
+        self.assertEqual(move_line_c.quantity, 6)
+        self.assertEqual(move_line_c.qty_picked, 6)
         self.assertEqual(move_line_c.state, "done")
         self.assertEqual(original_picking.backorder_ids, done_picking)
         self.assertEqual(done_picking.state, "done")
@@ -479,7 +479,7 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         self.assertEqual(move.product_id, self.product_c)
         self.assertEqual(move.product_uom_qty, 4)
         self.assertEqual(move.move_line_ids.quantity, 4)
-        self.assertEqual(move.move_line_ids.qty_done, 4)
+        self.assertEqual(move.move_line_ids.qty_picked, 4)
         # Check the response -> we must first process the backorder
         self.assert_response_start_single(
             response,
@@ -504,8 +504,8 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         done_picking2 = remaining_move_line_c.picking_id
         # Check move line data
         self.assertEqual(remaining_move_line_c.move_id.product_uom_qty, 4)
-        self.assertEqual(remaining_move_line_c.quantity, 0)
-        self.assertEqual(remaining_move_line_c.qty_done, 4)
+        self.assertEqual(remaining_move_line_c.quantity, 4)
+        self.assertEqual(remaining_move_line_c.qty_picked, 4)
         self.assertEqual(remaining_move_line_c.state, "done")
         self.assertTrue(done_picking2 != original_picking)
         self.assertEqual(done_picking2.state, "done")
@@ -536,8 +536,8 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
             },
         )
         self.assertEqual(move_line_d.move_id.product_uom_qty, 10)
-        self.assertEqual(move_line_d.quantity, 0)
-        self.assertEqual(move_line_d.qty_done, 10)
+        self.assertEqual(move_line_d.quantity, 10)
+        self.assertEqual(move_line_d.qty_picked, 10)
         self.assertEqual(move_line_d.state, "done")
         self.assertEqual(original_picking.state, "done")
 
@@ -568,9 +568,9 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         )
         done_picking = picking
         # Check move line data
-        self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.quantity, 0)
-        self.assertEqual(move_line.qty_done, 6)
+        self.assertEqual(move_line.move_id.product_uom_qty, 10)
+        self.assertEqual(move_line.quantity, 6)
+        self.assertEqual(move_line.qty_picked, 6)
         self.assertEqual(move_line.state, "done")
         self.assertEqual(done_picking.state, "done")
 
@@ -612,9 +612,9 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
         # 2 operations then the done operation is set into a specific picking
         first_done_picking = picking.backorder_ids
         # Check move line data
-        self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.quantity, 0)
-        self.assertEqual(move_line.qty_done, 6)
+        self.assertEqual(move_line.move_id.product_uom_qty, 10)
+        self.assertEqual(move_line.quantity, 6)
+        self.assertEqual(move_line.qty_picked, 6)
         self.assertEqual(move_line.state, "done")
         self.assertEqual(first_done_picking.state, "done")
 
@@ -639,9 +639,9 @@ class LocationContentTransferSetDestinationXCase(LocationContentTransferCommonCa
 
         # the initial picking should be done
         # Check move line data
-        self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.quantity, 0)
-        self.assertEqual(move_line.qty_done, 6)
+        self.assertEqual(move_line.move_id.product_uom_qty, 10)
+        self.assertEqual(move_line.quantity, 6)
+        self.assertEqual(move_line.qty_picked, 6)
         self.assertEqual(move_line.state, "done")
         self.assertEqual(picking.state, "done")
 
@@ -784,8 +784,8 @@ class LocationContentTransferSetDestinationXSpecialCase(
         self.assertEqual(done_picking.state, "done")
         self.assertEqual(original_picking.state, "assigned")
         self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.quantity, 0)
-        self.assertEqual(move_line.qty_done, 6)
+        self.assertEqual(move_line.quantity, 6)
+        self.assertEqual(move_line.qty_picked, 6)
         self.assertEqual(move_line.location_dest_id, self.dest_location)
         self.assertEqual(len(original_picking.move_ids), 2)
         moves_product_b = original_picking.move_ids.filtered(
@@ -805,7 +805,7 @@ class LocationContentTransferSetDestinationXSpecialCase(
         self.assertEqual(remaining_move.state, "assigned")
         self.assertEqual(remaining_move.product_uom_qty, 4)
         self.assertEqual(remaining_move.move_line_ids.quantity, 4)
-        self.assertEqual(remaining_move.move_line_ids.qty_done, 4)
+        self.assertEqual(remaining_move.move_line_ids.qty_picked, 4)
         # Check the response
         move_lines = self.service._find_transfer_move_lines(self.content_loc)
         self.assert_response_start_single(
@@ -893,7 +893,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         """
         picking_a = self.picking_a
         picking_b = self.picking_b
-        picking_a.move_line_ids.qty_done = 10
+        picking_a.move_line_ids.qty_picked = 10
         picking_a._action_done()
         self.assertEqual(picking_a.state, "done")
         self.assertEqual(picking_b.state, "assigned")
@@ -904,7 +904,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         )
 
         self.assertEqual(move_line_c.quantity, 10)
-        self.assertEqual(move_line_c.qty_done, 10)
+        self.assertEqual(move_line_c.qty_picked, 10)
         # Scan partial qty (6/10)
         self.service.dispatch(
             "set_destination_line",
@@ -917,8 +917,8 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         )
         # Check move line data
         self.assertEqual(move_line_c.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line_c.quantity, 0)
-        self.assertEqual(move_line_c.qty_done, 6)
+        self.assertEqual(move_line_c.quantity, 6)
+        self.assertEqual(move_line_c.qty_picked, 6)
         self.assertEqual(move_line_c.state, "done")
         # the move has been split
         move = move_line_c.picking_id.backorder_ids.move_ids
@@ -929,7 +929,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         move_line = move.move_line_ids
         self.assertEqual(move_line.move_id.product_uom_qty, 4)
         self.assertEqual(move_line.quantity, 4)
-        self.assertEqual(move_line.qty_done, 4)
+        self.assertEqual(move_line.qty_picked, 4)
 
     def test_set_destination_package_partial_qty_with_move_orig_ids(self):
         """Scanned destination location with partial qty, but related moves
@@ -943,9 +943,9 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         package1 = self.env["stock.quant.package"].create({})
         package2 = self.env["stock.quant.package"].create({})
         line1 = picking_a.move_line_ids
-        line2 = line1.copy({"quantity": 4, "qty_done": 4})
+        line2 = line1.copy({"quantity": 4, "qty_picked": 4})
         line1.with_context(bypass_reservation_update=True).quantity = 6
-        line1.qty_done = 6
+        line1.qty_picked = 6
         line1.result_package_id = package1
         line2.result_package_id = package2
         picking_a._action_done()
@@ -959,7 +959,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         move = move_line.move_id
 
         self.assertEqual(move_line.quantity, 6.0)
-        self.assertEqual(move_line.qty_done, 6.0)
+        self.assertEqual(move_line.qty_picked, 6.0)
         self._simulate_selected_move_line(move_line)
         # Scan partial qty (6/10)
         self.service.dispatch(
@@ -973,8 +973,8 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         )
         # Check move line data
         self.assertEqual(move_line.move_id.product_uom_qty, 6)
-        self.assertEqual(move_line.quantity, 0)
-        self.assertEqual(move_line.qty_done, 6)
+        self.assertEqual(move_line.quantity, 6)
+        self.assertEqual(move_line.qty_picked, 6)
         self.assertEqual(move_line.state, "done")
         # the move has been split
         self.assertNotEqual(move_line.move_id, move)
@@ -984,7 +984,7 @@ class LocationContentTransferSetDestinationChainSpecialCase(
         move_line = move.move_line_ids
         self.assertEqual(move_line.move_id.product_uom_qty, 4)
         self.assertEqual(move_line.quantity, 4)
-        self.assertEqual(move_line.qty_done, 4)
+        self.assertEqual(move_line.qty_picked, 4)
 
 
 class LocationContentTransferSetDestinationNextOperationSpecialCase(
@@ -1053,7 +1053,7 @@ class LocationContentTransferSetDestinationNextOperationSpecialCase(
         # check that the next operation has the appropriate attributes
         move_line = backorder.move_line_ids
         self.assertEqual(move_line.quantity, 4)
-        self.assertEqual(move_line.qty_done, 4)
+        self.assertEqual(move_line.qty_picked, 4)
         self.assertEqual(move_line.picking_id.user_id, self.env.user)
         # if we process the quantity of the backorder, the next operation should
         # be the remaining one of the initial picking

odoo/addons/shopfloor/tests/test_location_content_transfer_single.py

@@ -631,11 +631,9 @@ class LocationContentTransferSingleCase(LocationContentTransferCommonCase):
         the assigned user will be removed.
 
         """
-        self.env.user = self.shopfloor_manager
-        self.assertTrue(self.env.user != self.picking1.create_uid)
         package_level = self.picking1.move_line_ids.package_level_id
         move_lines_before = self.picking1.move_line_ids
-        move_lines_before.shopfloor_user_id = self.env.user
+        move_lines_before.shopfloor_user_id = self.env.ref("base.user_admin")
         response = self.service.dispatch(
             "stock_out_package",
             params={
@@ -852,12 +850,10 @@ class LocationContentTransferSingleSpecialCase(LocationContentTransferCommonCase
         compare to the previous test.
 
         """
-        self.env.user = self.shopfloor_manager
-        self.assertTrue(self.env.user != self.picking.create_uid)
         move_line = self.move_product_b.move_line_ids.filtered(
             lambda ml: ml.quantity == 4  # 4/10 to stock out
         )
-        move_line.shopfloor_user_id = self.env.user
+        move_line.shopfloor_user_id = self.env.ref("base.user_admin")
         self.service.dispatch(
             "stock_out_line",
             params={"location_id": self.content_loc.id, "move_line_id": move_line.id},

odoo/addons/shopfloor/tests/test_location_content_transfer_start.py

@@ -114,9 +114,9 @@ class TestLocationContentTransferStart(LocationContentTransferCommonCase):
         self.assertRecordValues(
             processed_move_lines,
             [
-                {"qty_done": 10.0},
-                {"qty_done": 10.0},
-                {"qty_done": 10.0},
+                {"qty_picked": 10.0},
+                {"qty_picked": 10.0},
+                {"qty_picked": 10.0},
             ],
         )
         self.assertRecordValues(
@@ -142,9 +142,9 @@ class TestLocationContentTransferStart(LocationContentTransferCommonCase):
         self.assertRecordValues(
             processed_move_lines,
             [
-                {"qty_done": 10.0},
-                {"qty_done": 10.0},
-                {"qty_done": 10.0},
+                {"qty_picked": 10.0},
+                {"qty_picked": 10.0},
+                {"qty_picked": 10.0},
             ],
         )
         self.assertRecordValues(
@@ -239,7 +239,7 @@ class LocationContentTransferStartSpecialCase(LocationContentTransferCommonCase)
         self.assertRecordValues(new_picking, [{"user_id": self.env.uid}])
         self.assertRecordValues(
             new_picking.move_line_ids,
-            [{"qty_done": 10.0}, {"qty_done": 10.0}],
+            [{"qty_picked": 10.0}, {"qty_picked": 10.0}],
         )
         self.assertRecordValues(new_picking.package_level_ids, [{"is_done": True}])
 
@@ -249,12 +249,12 @@ class LocationContentTransferStartSpecialCase(LocationContentTransferCommonCase)
             picking.move_line_ids,
             [
                 {
-                    "qty_done": 0.0,
+                    "qty_picked": 0.0,
                     "location_id": self.shelf1.id,
                     "package_id": other_pack_a.id,
                 },
                 {
-                    "qty_done": 0.0,
+                    "qty_picked": 0.0,
                     "location_id": self.shelf1.id,
                     "package_id": other_pack_b.id,
                 },
@@ -285,7 +285,7 @@ class LocationContentTransferStartSpecialCase(LocationContentTransferCommonCase)
             picking.move_ids, in_package=True, location=self.content_loc
         )
         picking.action_assign()
-        picking.move_line_ids[0].qty_done = 10
+        picking.move_line_ids[0].qty_picked = 10
         response = self.service.dispatch(
             "scan_location", params={"barcode": self.content_loc.barcode}
         )
@@ -315,7 +315,7 @@ class LocationContentTransferStartSpecialCase(LocationContentTransferCommonCase)
         )
         picking.action_assign()
         # a user picked qty
-        picking.move_line_ids[0].qty_done = 10
+        picking.move_line_ids[0].qty_picked = 10
         response = self.service.dispatch(
             "scan_location", params={"barcode": self.content_loc.barcode}
         )

{odoo_addon_shopfloor-18.0.0.6.0.2.dist-info → odoo_addon_shopfloor-18.0.0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-shopfloor
-Version: 18.0.0.6.0.2
+Version: 18.0.0.7.0
 Requires-Python: >=3.10
 Requires-Dist: odoo-addon-base_rest==18.0.*
 Requires-Dist: odoo-addon-jsonifier==18.0.*
@@ -42,7 +42,7 @@ Shopfloor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:63709bb5049a329746f85dcd55988b47e5e77d8a3be50ced7fc3768892762c22
+   !! source digest: sha256:ca49f8a6cee2bf4a565b75f59d5df7e7cb1ae0085216eb934d53dbb2442de969
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_shopfloor-18.0.0.6.0.2.dist-info → odoo_addon_shopfloor-18.0.0.7.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/shopfloor/README.rst,sha256=vpeT4OYvvgw1SyxTVqx99AdJ1QPD8587hPRlns0xyaQ,6138
+odoo/addons/shopfloor/README.rst,sha256=OFhaYSNmDL_CHeOAuBjjlY8Lzbs285p9fOoqlFnCGD0,6138
 odoo/addons/shopfloor/__init__.py,sha256=ke3RmZ7XkX-lz4S8NHAxNIEJ5_Nvj5bjBAqD-W-q73c,91
-odoo/addons/shopfloor/__manifest__.py,sha256=K1AyooaB8j3Kv9MPFYj1lohw5Fln9E7Z-O_6qnoGQRY,2572
+odoo/addons/shopfloor/__manifest__.py,sha256=JRhFwGcICZePvBOPFJRLry_O1aRlK7bwr9SDlOeV0lo,2572
 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
@@ -73,7 +73,7 @@ odoo/addons/shopfloor/services/__init__.py,sha256=4lhF0VNx8QosVEZj9QJYgv6oWD0kl9
 odoo/addons/shopfloor/services/checkout.py,sha256=E40wOnnuKhpc98Q27ePz0nAvd9xB3-o6GSz8C7Hj6oc,82616
 odoo/addons/shopfloor/services/cluster_picking.py,sha256=U40bzXXmxGOnKL7yhQzpZfAVyDL2sBbNHIbIcUfdBvg,71927
 odoo/addons/shopfloor/services/delivery.py,sha256=Gxbwp0x9XPLx9AJ3GFDSH69xHrQCD_R8m2i78kuuS6s,34352
-odoo/addons/shopfloor/services/location_content_transfer.py,sha256=ovx3w4xnACTlc-24JmUcGtcKgaTb1FXpZ31m2FhTGM4,50431
+odoo/addons/shopfloor/services/location_content_transfer.py,sha256=JpuWlHBzRNSk90k6EHq8gAvgaNkV3IlsTo5b7kycILw,50904
 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=oTYAPM3zwm5gWgEJyBsbQlq0AODPq9T8LPwt39NTUBw,6438
@@ -82,14 +82,14 @@ odoo/addons/shopfloor/services/zone_picking.py,sha256=BI25T234hcjlgGDIMjsO6PfDUK
 odoo/addons/shopfloor/services/forms/__init__.py,sha256=nxwJdKX47hb56ERf4Qb3UE5dkdsHCbkaXMAXs4XMAd8,27
 odoo/addons/shopfloor/services/forms/picking_form.py,sha256=pX1hbALlCqTVG3m1HYY5xtgbTcSHVnpaGaqm3akBS-U,2718
 odoo/addons/shopfloor/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/shopfloor/static/description/index.html,sha256=VcVJce6blHWG92LiUbysuNWZtN35msLaLqA_BSAetO8,18540
-odoo/addons/shopfloor/tests/__init__.py,sha256=1L6fBScnX0sYhGhRfdrJAgc0BVT2bzO_43WJ8aiIhIU,3986
+odoo/addons/shopfloor/static/description/index.html,sha256=87Fyh82wk3jdBRLWhCaXXj1FtyfPQscHHyXEX47BWrw,18540
+odoo/addons/shopfloor/tests/__init__.py,sha256=OV8MGZwrL3VieTRFhVrTFdCm-ozoFfMQtX81EhXNQmg,3967
 odoo/addons/shopfloor/tests/common.py,sha256=lFdSQRXBjwCr7StVJltEwLtA_a4V77JcBcKkGAnAL5M,11676
 odoo/addons/shopfloor/tests/models.py,sha256=PWNPC6DgFMbrarojSxUqwycnBdePX-4Q5Z0rn1WwQqY,940
 odoo/addons/shopfloor/tests/test_actions_change_package_lot.py,sha256=bUn-FXPWY-eo4kaS0S7jU4ge_xl1A9jfU_rNZQT8ZPs,47528
-odoo/addons/shopfloor/tests/test_actions_data.py,sha256=9zrUKDU7e5Z5HfbTBVYhiEd63wi-TuXuuKWeba7L8Y8,16397
+odoo/addons/shopfloor/tests/test_actions_data.py,sha256=EEQUl-rBT9_bHVcLt20GpV0c1K1CrToKnWgLxYZ_IMc,16567
 odoo/addons/shopfloor/tests/test_actions_data_base.py,sha256=dEMThGgJdks9oZMkPXySSchS-gETAAPER1WOv194J7E,10607
-odoo/addons/shopfloor/tests/test_actions_data_detail.py,sha256=ywqEnZDp1Z6SJqEh-yEGFINwyHwabRHwQGokTf3kMlk,14114
+odoo/addons/shopfloor/tests/test_actions_data_detail.py,sha256=nbvRscyQXCTORm8FHv1Nkc9jIjF_3HyZllf7CNKiDXc,14130
 odoo/addons/shopfloor/tests/test_actions_packaging.py,sha256=viofwEFk4aqn2tNaQGz2gGvBH6XoY25c6fO0a0uU448,1616
 odoo/addons/shopfloor/tests/test_actions_search.py,sha256=UOBemh1RxDabMhyIRQZfRM7-YlBF4kJIvsilyYsh03A,9232
 odoo/addons/shopfloor/tests/test_actions_search_move_line.py,sha256=ys7Y0mGdg3LNs8l1x8WCx8I_Qb9xsU9XAXOGPKuWv48,5783
@@ -139,15 +139,15 @@ odoo/addons/shopfloor/tests/test_delivery_select.py,sha256=eMwTik3yQIfh7bci8B-jr
 odoo/addons/shopfloor/tests/test_delivery_set_qty_done_line.py,sha256=00QUJHMXL5p4SrDsA67AMR88PkGS5Ai_LHDvmLtxPNM,3473
 odoo/addons/shopfloor/tests/test_delivery_set_qty_done_pack.py,sha256=Q0YQlrhQtfEHU-JG2zfdTNNg_PxeHdRU5W87g4PKwXU,5367
 odoo/addons/shopfloor/tests/test_delivery_sublocation.py,sha256=UsjtvjRNU1qNTuXpcZyAcBhFHZcj-0IoviIl4a7D1_4,6301
-odoo/addons/shopfloor/tests/test_location_content_transfer_base.py,sha256=hIn52m-WaxTIbYdbklggQ6tFN_Emicn9wSQrL0IEdnA,6831
-odoo/addons/shopfloor/tests/test_location_content_transfer_get_work.py,sha256=9Jkq_aVMPgbNlRlcvgeDV2Ay-YBhMGzdtUqlQrnSuMg,6520
-odoo/addons/shopfloor/tests/test_location_content_transfer_mix.py,sha256=Q-57TQVDEDAH-dhn99Vrqt80osaYYEa7m4vw6b86Nrw,23966
+odoo/addons/shopfloor/tests/test_location_content_transfer_base.py,sha256=WGTsRSI3spcuiWYNGQldMev8JPfiI_zUHYNtq_9iZXo,6743
+odoo/addons/shopfloor/tests/test_location_content_transfer_get_work.py,sha256=f1eaC0ksEJlF8X_7QUyIRmjo4qdmMWW28yw9vD-pE7E,6517
+odoo/addons/shopfloor/tests/test_location_content_transfer_mix.py,sha256=qCQDaPUsfUR0xHSgkG1jdVL8xGVzAdwkyOoiMb_H_4g,25118
 odoo/addons/shopfloor/tests/test_location_content_transfer_putaway.py,sha256=rcnv0Y_J1rr9YuCnnnNzS68lOp5tYn9Xx8_Kb1L6AWM,5847
 odoo/addons/shopfloor/tests/test_location_content_transfer_scan_location.py,sha256=XvEmMW8e2fMFQ_8iHKbrxm-vFVcBMRYtof7opuVQ6E8,1519
-odoo/addons/shopfloor/tests/test_location_content_transfer_set_destination_all.py,sha256=cMiwpGMzsITHE0HYQLqzqtTX5_i8p5sPRG39H56Xj1Q,14276
-odoo/addons/shopfloor/tests/test_location_content_transfer_set_destination_package_or_line.py,sha256=T7goo8lrVySH6nLZup1q2kv6DgGd1JucN9opME2eRdA,44480
-odoo/addons/shopfloor/tests/test_location_content_transfer_single.py,sha256=a_w8ZuusdOnl94l4s5xo8CIVWmy8tMelCPGfT-WO8mk,33361
-odoo/addons/shopfloor/tests/test_location_content_transfer_start.py,sha256=AuDBOVwSrPIoqGTta7GaZ3clACTvFia4MEwmxbg2H6M,15403
+odoo/addons/shopfloor/tests/test_location_content_transfer_set_destination_all.py,sha256=Oueib2KS6nxd3EBuKUblgAfxHJZzG60iDTc-xEZyLmA,14702
+odoo/addons/shopfloor/tests/test_location_content_transfer_set_destination_package_or_line.py,sha256=pEn2g10exW9FrpA07-4SY8sRX4r6a553H_9fguhQpdg,44524
+odoo/addons/shopfloor/tests/test_location_content_transfer_single.py,sha256=8aGvmeQzrB9ZILI0O_DthGMyZAwOfpFCDBbEk1suDHA,33170
+odoo/addons/shopfloor/tests/test_location_content_transfer_start.py,sha256=ezrPvwCRqg3_0wozTiGBsQYsBITfDpLBWvqDXJNHHjw,15427
 odoo/addons/shopfloor/tests/test_menu_base.py,sha256=TvLLAyW2POt42UAYn7qmusfPSVRTVI3Ojex5Pz39sDs,9205
 odoo/addons/shopfloor/tests/test_menu_contrains.py,sha256=kdnKgPXyRgsHW96_Q_70JCySwvZYskMX9o1xQ6-DrC4,1324
 odoo/addons/shopfloor/tests/test_menu_counters.py,sha256=RkfZYMjS8fQSz0QMsLB8nkciY7X6JN2KoL3MS93S2PI,6328
@@ -184,7 +184,7 @@ odoo/addons/shopfloor/views/shopfloor_menu.xml,sha256=ffKWocGBGvE-hpaLMytpAm2FiQ
 odoo/addons/shopfloor/views/stock_location.xml,sha256=d7iqbOQZbb5YPSdAXlQ6spcj8dUvQ37DpEGuaLX5B1M,829
 odoo/addons/shopfloor/views/stock_move_line.xml,sha256=AmIO95-G0AD5i5C3x_BQL_NARXvyCfe4mg9iM97wD1U,1996
 odoo/addons/shopfloor/views/stock_picking_type.xml,sha256=M3U8xijiL6ZJUx2IiYelIYECsCRtOCU1J6lwlWzx3Jo,778
-odoo_addon_shopfloor-18.0.0.6.0.2.dist-info/METADATA,sha256=e-PvTDP7PN74LCVCJJJnxtxuNrdXsaXQVRvrVXNzCio,7582
-odoo_addon_shopfloor-18.0.0.6.0.2.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_shopfloor-18.0.0.6.0.2.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_shopfloor-18.0.0.6.0.2.dist-info/RECORD,,
+odoo_addon_shopfloor-18.0.0.7.0.dist-info/METADATA,sha256=g1PLrOz1bKIvNoElCyDS7OMYF66rX9WuXDGNfCMSjOA,7580
+odoo_addon_shopfloor-18.0.0.7.0.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
+odoo_addon_shopfloor-18.0.0.7.0.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_shopfloor-18.0.0.7.0.dist-info/RECORD,,