diff --git a/addons/mrp/models/stock_move.py b/addons/mrp/models/stock_move.py
index 02df5a27315..6f40373bcf9 100644
--- a/addons/mrp/models/stock_move.py
+++ b/addons/mrp/models/stock_move.py
@@ -149,7 +149,8 @@ class StockMove(models.Model):
         for move in self:
             if move.state != 'draft':
                 continue
-            move.manual_consumption = not move.raw_material_production_id.use_auto_consume_components_lots and (move.bom_line_id.manual_consumption or move.has_tracking != 'none')
+            move.manual_consumption = (move.has_tracking != 'none' and not move.raw_material_production_id.use_auto_consume_components_lots) or \
+                (move.has_tracking == 'none' and move.bom_line_id.manual_consumption)
 
     @api.depends('bom_line_id')
     def _compute_description_bom_line(self):