diff --git a/addons/stock/data/stock_demo2.xml b/addons/stock/data/stock_demo2.xml
index 5335ea12533..c9ef3c1868a 100644
--- a/addons/stock/data/stock_demo2.xml
+++ b/addons/stock/data/stock_demo2.xml
@@ -535,18 +535,30 @@
 
         <record id="stock.outgoing_shipment_main_warehouse4" model="stock.picking">
             <field name="date_done" eval="DateTime.today() - timedelta(days=24)"/>
-            <field name="scheduled_date" eval="DateTime.today() - timedelta(days=26)"/>
         </record>
 
         <record id="stock.outgoing_shipment_main_warehouse5" model="stock.picking">
             <field name="date_done" eval="DateTime.today() - timedelta(days=17)"/>
-            <field name="scheduled_date" eval="DateTime.today() - timedelta(days=18)"/>
         </record>
 
         <record id="stock.outgoing_shipment_main_warehouse6" model="stock.picking">
             <field name="date_done" eval="DateTime.today() - timedelta(days=7)"/>
-            <field name="scheduled_date" eval="DateTime.today() - timedelta(days=7)"/>
         </record>
 
+        <function model="stock.move" name="write">
+            <value model="stock.move" search="[('picking_id', '=', ref('stock.outgoing_shipment_main_warehouse4'))]"/>
+            <value eval="{'date_expected': DateTime.today() - timedelta(days=26)}"/>
+        </function>
+
+        <function model="stock.move" name="write">
+            <value model="stock.move" search="[('picking_id', '=', ref('stock.outgoing_shipment_main_warehouse5'))]"/>
+            <value eval="{'date_expected': DateTime.today() - timedelta(days=18)}"/>
+        </function>
+
+        <function model="stock.move" name="write">
+            <value model="stock.move" search="[('picking_id', '=', ref('stock.outgoing_shipment_main_warehouse6'))]"/>
+            <value eval="{'date_expected': DateTime.today() - timedelta(days=7)}"/>
+        </function>
+
     </data>
 </odoo>
diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 4af5eeb1a6b..f58b74cb27d 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -449,6 +449,8 @@ class Picking(models.Model):
 
     def _set_scheduled_date(self):
         for picking in self:
+            if picking.state in ('done', 'cancel'):
+                raise UserError(_("You cannot change the Scheduled Date on a done or cancelled transfer."))
             picking.move_lines.write({'date_expected': picking.scheduled_date})
 
     def _has_scrap_move(self):