diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 33faf25e3b7..7a67e07b1cb 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -788,11 +788,11 @@ class Picking(models.Model):
             if operations:
                 package = self.env['stock.quant.package'].create({})
                 for operation in operations:
-                    if float_compare(operation.qty_done, operation.product_qty, precision_rounding=operation.product_uom_id.rounding) >= 0:
+                    if float_compare(operation.qty_done, operation.product_uom_qty, precision_rounding=operation.product_uom_id.rounding) >= 0:
                         operation_ids |= operation
                     else:
                         quantity_left_todo = float_round(
-                            operation.product_qty - operation.qty_done,
+                            operation.product_uom_qty - operation.qty_done,
                             precision_rounding=operation.product_uom_id.rounding,
                             rounding_method='UP')
                         new_operation = operation.copy(