diff --git a/addons/sale_order_dates/models/sale_order.py b/addons/sale_order_dates/models/sale_order.py
index e2ea8b893bb..30d602cadf8 100644
--- a/addons/sale_order_dates/models/sale_order.py
+++ b/addons/sale_order_dates/models/sale_order.py
@@ -37,7 +37,8 @@ class SaleOrder(models.Model):
                 dt = order_datetime + timedelta(days=line.customer_lead or 0.0)
                 dates_list.append(dt)
             if dates_list:
-                order.commitment_date = fields.Datetime.to_string(min(dates_list))
+                commit_date = min(dates_list) if order.picking_policy == 'direct' else max(dates_list)
+                order.commitment_date = fields.Datetime.to_string(commit_date)
 
     def _compute_picking_ids(self):
         super(SaleOrder, self)._compute_picking_ids()