diff --git a/addons/mrp/models/product.py b/addons/mrp/models/product.py
index 663e6da0aef..18f93a6050f 100644
--- a/addons/mrp/models/product.py
+++ b/addons/mrp/models/product.py
@@ -87,6 +87,10 @@ class ProductTemplate(models.Model):
         }
         return action
 
+    def action_compute_bom_days(self):
+        templates = self.filtered(lambda t: t.bom_count > 0)
+        if templates:
+            return templates.mapped('product_variant_id').action_compute_bom_days()
 
 class ProductProduct(models.Model):
     _inherit = "product.product"
@@ -281,6 +285,15 @@ class ProductProduct(models.Model):
             res['context'].pop('default_product_tmpl_id', None)
         return res
 
+    def action_compute_bom_days(self):
+        bom_by_products = self.env['mrp.bom']._bom_find(self)
+        company_id = self.env.context.get('default_company_id', self.env.company.id)
+        warehouse = self.env['stock.warehouse'].search([('company_id', '=', company_id)], limit=1)
+        for product in self:
+            bom_data = self.env['report.mrp.report_bom_structure'].with_context(minimized=True)._get_bom_data(bom_by_products[product], warehouse, product, ignore_stock=True)
+            availability_delay = bom_data.get('resupply_avail_delay')
+            product.days_to_prepare_mo = availability_delay - bom_data.get('lead_time', 0) if availability_delay else 0
+
     def _match_all_variant_values(self, product_template_attribute_value_ids):
         """ It currently checks that all variant values (`product_template_attribute_value_ids`)
         are in the product (`self`).
diff --git a/addons/mrp/views/product_views.xml b/addons/mrp/views/product_views.xml
index 5ea072a561e..38b86b1623c 100644
--- a/addons/mrp/views/product_views.xml
+++ b/addons/mrp/views/product_views.xml
@@ -8,6 +8,7 @@
             <field name="inherit_id" ref="stock.view_template_property_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//label[@for='sale_delay']" position="before">
+                    <field name="bom_count" string="Bill of Materials" invisible="1"/>
                     <label for="produce_delay" string="Manuf. Lead Time" attrs="{'invisible':[('type','=','service')]}"/>
                     <div attrs="{'invisible':[('type','=','service')]}">
                         <field name="produce_delay" class="oe_inline"/> days
@@ -15,6 +16,9 @@
                     <label for="days_to_prepare_mo" attrs="{'invisible':[('type','=','service')]}"/>
                     <div attrs="{'invisible':[('type','=','service')]}">
                         <field name="days_to_prepare_mo" class="oe_inline"/> days
+                        <button name="action_compute_bom_days" string="Compute from BoM" type="object" attrs="{'invisible':['|', ('type', '=', 'service'), ('bom_count', '=', 0)]}"
+                                help="Compute the days required to resupply all components from BoM, by either buying or manufacturing the components and/or subassemblies."
+                                class="oe_link oe_read_only pt-0"/>
                     </div>
                 </xpath>
                 <xpath expr="//field[@name='product_variant_count']" position="after">