diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py
index 4d004bd718d..96a3af94ab8 100644
--- a/addons/stock/models/stock_move.py
+++ b/addons/stock/models/stock_move.py
@@ -492,6 +492,10 @@ class StockMove(models.Model):
             initial_values = dict((picking.id, {'state': picking.state}) for picking in pickings)
 
         res = super(StockMove, self).write(vals)
+        if vals.get('date_expected'):
+            for move in self:
+                if move.state not in ('done', 'cancel'):
+                    move.date = move.date_expected
 
         if track_pickings:
             pickings.message_track(pickings.fields_get(['state']), initial_values)
@@ -812,11 +816,6 @@ class StockMove(models.Model):
         self.name = product.partner_ref
         self.product_uom = product.uom_id.id
 
-    @api.onchange('date_expected')
-    def onchange_date(self):
-        if self.date_expected:
-            self.date = self.date_expected
-
     @api.onchange('move_line_nosuggest_ids')
     def onchange_move_line_nosuggest_ids(self):
         breaking_char = '\n'