Merge PR #778 into 14.0

Signed-off-by jbaudoux
OCA · Nov 21, 2023 · a09672e · a09672e
2 parents 945bab0 + df915d3
commit a09672e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/shopfloor/actions/data.py b/shopfloor/actions/data.py
@@ -355,16 +355,11 @@ def _get_operation_progress(self, domain):
         lines = self.env["stock.move.line"].search(domain)
         # operations_to_do = number of total operations that are pending for this location.
         # operations_done = number of operations already done.
-        # A line with an assigned package counts as 1 operation.
         operations_to_do = 0
         operations_done = 0
         for line in lines:
-            is_done = line.qty_done == line.product_uom_qty
-            package_qty_done = 1 if is_done else 0
-            operations_done += (
-                line.qty_done if not line.package_id else package_qty_done
-            )
-            operations_to_do += line.product_uom_qty if not line.package_id else 1
+            operations_done += line.qty_done
+            operations_to_do += line.product_uom_qty - line.qty_done
         return {
             "done": operations_done,
             "to_do": operations_to_do,

diff --git a/shopfloor/tests/test_actions_data.py b/shopfloor/tests/test_actions_data.py
@@ -51,7 +51,7 @@ def test_data_location_with_operation_progress(self):
             "barcode": location.name,
             "operation_progress": {
                 "done": 16.0,
-                "to_do": 165.0,
+                "to_do": 167.0,
             },
         }
         self.assertDictEqual(data, expected)