From d38eb79411e32677c646de1184d29bba6d355559 Mon Sep 17 00:00:00 2001 From: "John Holton (hojo)" Date: Wed, 24 Apr 2024 13:49:44 -0700 Subject: [PATCH] [MOV] MRP: Create subcontracting scope closes odoo/documentation#8969 Signed-off-by: Samuel Lieber (sali) --- .../inventory_and_mrp/manufacturing.rst | 1 + .../{workflows => }/subcontracting.rst | 40 +++++++++++++++--- .../subcontracting/subcontracting-setting.png | Bin .../subcontracting_basic.rst | 0 .../subcontracting_basic/bom-type.png | Bin .../subcontracting_basic/subcontractor-po.png | Bin .../subcontracting_dropship.rst | 0 .../subcontracting_dropship/bom-type.png | Bin .../subcontractor-po.png | Bin .../subcontracting_dropship/vendor-po.png | Bin .../subcontracting_resupply.rst | 0 .../subcontracting_resupply/bom-type.png | Bin .../subcontractor-po.png | Bin .../manufacturing/workflows.rst | 4 -- redirects/17.0.txt | 4 ++ 15 files changed, 39 insertions(+), 10 deletions(-) rename content/applications/inventory_and_mrp/manufacturing/{workflows => }/subcontracting.rst (84%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => }/subcontracting/subcontracting-setting.png (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_basic.rst (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_basic/bom-type.png (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_basic/subcontractor-po.png (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_dropship.rst (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_dropship/bom-type.png (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_dropship/subcontractor-po.png (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_dropship/vendor-po.png (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_resupply.rst (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_resupply/bom-type.png (100%) rename content/applications/inventory_and_mrp/manufacturing/{workflows => subcontracting}/subcontracting_resupply/subcontractor-po.png (100%) diff --git a/content/applications/inventory_and_mrp/manufacturing.rst b/content/applications/inventory_and_mrp/manufacturing.rst index 30500b35c..f939b8cb3 100644 --- a/content/applications/inventory_and_mrp/manufacturing.rst +++ b/content/applications/inventory_and_mrp/manufacturing.rst @@ -22,3 +22,4 @@ allow workers to trigger maintenance operations, feedback loops, quality issues, manufacturing/advanced_configuration manufacturing/workflows manufacturing/shop_floor + manufacturing/subcontracting diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting.rst b/content/applications/inventory_and_mrp/manufacturing/subcontracting.rst similarity index 84% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting.rst rename to content/applications/inventory_and_mrp/manufacturing/subcontracting.rst index 05704f9e0..5f0f86207 100644 --- a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting.rst +++ b/content/applications/inventory_and_mrp/manufacturing/subcontracting.rst @@ -1,6 +1,8 @@ -======================= -Subcontracting overview -======================= +:show-content: + +============== +Subcontracting +============== .. |BoM| replace:: :abbr:`BoM (Bill of Materials)` @@ -28,6 +30,24 @@ In Odoo, companies can configure their subcontracting workflows based on a varie factors, including how components are sourced, and what happens to finished products once they are manufactured. +.. cards:: + + .. card:: Basic subcontracting + :target: subcontracting/subcontracting_basic + + Subcontract products without supplying the subcontractor with components. + + .. card:: Resupply subcontractor + :target: subcontracting/subcontracting_resupply + + Ship components to a subcontractor each time a PO for a subcontracted product is confirmed. + + .. card:: Dropship to subcontractor + :target: subcontracting/subcontracting_dropship + + Dropship components to a subcontractor each time a PO for a subcontracted product is + confirmed. + Configuration ============= @@ -58,13 +78,14 @@ In Odoo, there are three subcontracting workflows, the main difference between t subcontractor obtains the necessary components: - In the *basic* subcontracting workflow, the subcontractor is fully responsible for obtaining the - components. This workflow is outlined in the :doc:`subcontracting_basic` documentation. + components. This workflow is outlined in the :doc:`subcontracting/subcontracting_basic` + documentation. - In the *Resupply Subcontractor on Order* workflow, the contracting company sends the components from their warehouse to the subcontractor. This workflow is outlined in the - :doc:`subcontracting_resupply` documentation. + :doc:`subcontracting/subcontracting_resupply` documentation. - In the *Dropship Subcontractor on Order* workflow, the contracting company purchases the components from a vendor, and has them delivered directly to the subcontractor. This workflow is - outlined in the :doc:`subcontracting_dropship` documentation. + outlined in the :doc:`subcontracting/subcontracting_dropship` documentation. In addition to how a subcontractor obtains components, it is also necessary to consider why a product is being subcontracted, as well as what happens to products once they are manufactured by @@ -103,3 +124,10 @@ equation: It is important to note that not every subcontracted product valuation will include all of these variables. For example, if the product is not dropshipped to the end customer, then there is no need to factor in the cost of dropshipping. + +.. toctree:: + :titlesonly: + + subcontracting/subcontracting_basic + subcontracting/subcontracting_resupply + subcontracting/subcontracting_dropship diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting/subcontracting-setting.png b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting-setting.png similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting/subcontracting-setting.png rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting-setting.png diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_basic.rst b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_basic.rst similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_basic.rst rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_basic.rst diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_basic/bom-type.png b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_basic/bom-type.png similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_basic/bom-type.png rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_basic/bom-type.png diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_basic/subcontractor-po.png b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_basic/subcontractor-po.png similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_basic/subcontractor-po.png rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_basic/subcontractor-po.png diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_dropship.rst b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_dropship.rst similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_dropship.rst rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_dropship.rst diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_dropship/bom-type.png b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_dropship/bom-type.png similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_dropship/bom-type.png rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_dropship/bom-type.png diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_dropship/subcontractor-po.png b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_dropship/subcontractor-po.png similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_dropship/subcontractor-po.png rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_dropship/subcontractor-po.png diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_dropship/vendor-po.png b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_dropship/vendor-po.png similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_dropship/vendor-po.png rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_dropship/vendor-po.png diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_resupply.rst b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_resupply.rst similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_resupply.rst rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_resupply.rst diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_resupply/bom-type.png b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_resupply/bom-type.png similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_resupply/bom-type.png rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_resupply/bom-type.png diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_resupply/subcontractor-po.png b/content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_resupply/subcontractor-po.png similarity index 100% rename from content/applications/inventory_and_mrp/manufacturing/workflows/subcontracting_resupply/subcontractor-po.png rename to content/applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_resupply/subcontractor-po.png diff --git a/content/applications/inventory_and_mrp/manufacturing/workflows.rst b/content/applications/inventory_and_mrp/manufacturing/workflows.rst index d1bb2bcd1..cc3db2004 100644 --- a/content/applications/inventory_and_mrp/manufacturing/workflows.rst +++ b/content/applications/inventory_and_mrp/manufacturing/workflows.rst @@ -7,10 +7,6 @@ Workflows .. toctree:: :titlesonly: - workflows/subcontracting - workflows/subcontracting_basic - workflows/subcontracting_dropship - workflows/subcontracting_resupply workflows/use_mps workflows/work_center_time_off workflows/scrap_manufacturing diff --git a/redirects/17.0.txt b/redirects/17.0.txt index 1d81d75d4..5c0e5c8c4 100644 --- a/redirects/17.0.txt +++ b/redirects/17.0.txt @@ -48,6 +48,10 @@ applications/inventory_and_mrp/manufacturing/management/use_mps.rst applications applications/inventory_and_mrp/manufacturing/management/using_work_centers.rst applications/inventory_and_mrp/manufacturing/advanced_configuration/using_work_centers.rst # management/* --> advanced_configuration/* applications/inventory_and_mrp/manufacturing/management/work_center_time_off.rst applications/inventory_and_mrp/manufacturing/workflows/work_center_time_off.rst # management/* --> workflows/* applications/inventory_and_mrp/manufacturing/management/work_order_dependencies.rst applications/inventory_and_mrp/manufacturing/advanced_configuration/work_order_dependencies.rst # management/* --> advanced_configuration/* +applications/inventory_and_mrp/manufacturing/workflows/subcontracting.rst applications/inventory_and_mrp/manufacturing/subcontracting.rst # workflows/* --> manufacturing/* +applications/inventory_and_mrp/manufacturing/workflows/subcontracting_basic.rst applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_basic.rst # workflows/* --> subcontracting/* +applications/inventory_and_mrp/manufacturing/workflows/subcontracting_dropship.rst applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_dropship.rst # workflows/* --> subcontracting/* +applications/inventory_and_mrp/manufacturing/workflows/subcontracting_resupply.rst applications/inventory_and_mrp/manufacturing/subcontracting/subcontracting_resupply.rst # workflows/* --> subcontracting/* # applications/marketing