diff --git a/content/applications/inventory_and_mrp/inventory/product_management/product_tracking/create_sn.rst b/content/applications/inventory_and_mrp/inventory/product_management/product_tracking/create_sn.rst
index ae4e0df93..a22936ecd 100644
--- a/content/applications/inventory_and_mrp/inventory/product_management/product_tracking/create_sn.rst
+++ b/content/applications/inventory_and_mrp/inventory/product_management/product_tracking/create_sn.rst
@@ -18,7 +18,9 @@ In Odoo, serial numbers are assigned to products:
   receipt
 - in the :ref:`Open: Stock move window <inventory/product_management/stock-move-section>` on a
   receipt
-- when closing a manufacturing order
+- :doc:`during a manufacturing order
+  <../../../manufacturing/basic_setup/configure_manufacturing_product>` for a product tracked by
+  lot/serial numbers
 - when making an inventory adjustment
 
 .. _inventory/product_management/detailed-operations-popup:
diff --git a/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product.rst b/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product.rst
index 587f58d84..52f05fa79 100644
--- a/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product.rst
+++ b/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product.rst
@@ -24,6 +24,32 @@ checkbox in the :guilabel:`Routes` section. This tells Odoo the product can be m
    :align: center
    :alt: The Manufacturing route on the Inventory tab of a product page.
 
+.. _manufacturing/basic_setup/lot-serial-tracking:
+
+Lot/serial number tracking
+--------------------------
+
+The assignment of lots or serial numbers to newly manufactured products is optional. To optionally
+:doc:`assign lots or serial numbers <../../inventory/product_management/product_tracking/create_sn>`
+to newly manufactured products, go to the :guilabel:`Traceability` section in the
+:guilabel:`Inventory` tab. In the :guilabel:`Tracking` field, select :guilabel:`By Unique Serial
+Number` or :guilabel:`By Lots`.
+
+Doing so enables the *Lot/Serial Number* field on a manufacturing order, or the *Register
+Production* instruction on a work order card in the *Shop Floor* app.
+
+.. figure:: configure_manufacturing_product/lot-number-field.png
+   :align: center
+   :alt: "Lot/Serial Number" field on the MO.
+
+   **Lot/Serial Number** field on the MO.
+
+.. figure:: configure_manufacturing_product/register-production.png
+   :align: center
+   :alt: **Register Production** option to generate lot/serial number on a work order card.
+
+   **Register Production** option to generate lot/serial number on a work order card.
+
 Configure a bill of materials (BoM)
 ===================================
 
diff --git a/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product/lot-number-field.png b/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product/lot-number-field.png
new file mode 100644
index 000000000..faa3ba462
Binary files /dev/null and b/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product/lot-number-field.png differ
diff --git a/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product/register-production.png b/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product/register-production.png
new file mode 100644
index 000000000..df6db0830
Binary files /dev/null and b/content/applications/inventory_and_mrp/manufacturing/basic_setup/configure_manufacturing_product/register-production.png differ