diff --git a/stock_picking_date_done/models/__init__.py b/stock_picking_date_done/models/__init__.py
index 2fbbaa868b..3c71fd1b86 100644
--- a/stock_picking_date_done/models/__init__.py
+++ b/stock_picking_date_done/models/__init__.py
@@ -1,3 +1,2 @@
 from . import stock_picking
 from . import stock_move
-from . import stock_move_line
diff --git a/stock_picking_date_done/models/stock_move_line.py b/stock_picking_date_done/models/stock_move_line.py
deleted file mode 100644
index b2e76c7461..0000000000
--- a/stock_picking_date_done/models/stock_move_line.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2022 Alfredo de la Fuente - AvanzOSC
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
-from odoo import models
-
-
-class StockMoveLine(models.Model):
-    _inherit = "stock.move.line"
-
-    def write(self, vals):
-        result = super().write(vals)
-        if "with_custom_date_done" not in self.env.context and "date" in vals:
-            for line in self:
-                if line.picking_id.custom_date_done:
-                    line.with_context(with_custom_date_done=True).date = (
-                        line.picking_id.custom_date_done
-                    )
-        return result
diff --git a/stock_picking_date_done/models/stock_picking.py b/stock_picking_date_done/models/stock_picking.py
index 28380309f4..85fcdd5ad0 100644
--- a/stock_picking_date_done/models/stock_picking.py
+++ b/stock_picking_date_done/models/stock_picking.py
@@ -14,14 +14,8 @@ def button_validate(self):
             pickings_custom_date_done_null.write(
                 {"custom_date_done": fields.Datetime.now()}
             )
-        return super().button_validate()
-
-    def write(self, vals):
-        result = super().write(vals)
-        if "custom_date_done" in vals:
-            for line in self:
-                for move in line.move_ids_without_package:
-                    move.date = line.custom_date_done
-                for move_line in line.move_line_ids_without_package:
-                    move_line.date = line.custom_date_done
+        result = super().button_validate()
+        for picking in self:
+            picking.move_ids.write({"date": picking.custom_date_done })
+            picking.move_line_ids.write({"date": picking.custom_date_done })
         return result