diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index 4ca19d3b9d3..d1b8abe06d9 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -2199,6 +2199,16 @@ class MrpProduction(models.Model):
             'res_id': production.id,
         }
 
+    def action_plan_with_components_availability(self):
+        for production in self.filtered(lambda p: p.state in ('draft', 'confirmed')):
+            if production.state == 'draft':
+                production.action_confirm()
+            expected_date = max(production.move_raw_ids.filtered('forecast_expected_date').mapped('forecast_expected_date'), default=False)
+            if expected_date:
+                production.date_start = expected_date
+        self.button_plan()
+
+
     def _has_workorders(self):
         return self.workorder_ids
 
diff --git a/addons/mrp/views/mrp_production_views.xml b/addons/mrp/views/mrp_production_views.xml
index 07742956a15..0786d6b588a 100644
--- a/addons/mrp/views/mrp_production_views.xml
+++ b/addons/mrp/views/mrp_production_views.xml
@@ -79,6 +79,16 @@
             <field name="code">action = records.action_split()</field>
         </record>
 
+        <record id="action_plan_with_components_availability" model="ir.actions.server">
+            <field name="name">Plan based on Components Availability</field>
+            <field name="groups_id" eval="[(4, ref('mrp.group_mrp_routings'))]"/>
+            <field name="model_id" ref="mrp.model_mrp_production"/>
+            <field name="binding_model_id" ref="mrp.model_mrp_production"/>
+            <field name="binding_view_types">list,form</field>
+            <field name="state">code</field>
+            <field name="code">action = records.action_plan_with_components_availability()</field>
+        </record>
+
         <record id="action_production_order_merge" model="ir.actions.server">
             <field name="name">Merge</field>
             <field name="model_id" ref="mrp.model_mrp_production"/>