diff --git a/manufacturing/management/media/subcontract_02.png b/manufacturing/management/media/subcontract_02.png deleted file mode 100644 index 40441aad0..000000000 Binary files a/manufacturing/management/media/subcontract_02.png and /dev/null differ diff --git a/manufacturing/management/media/subcontract_06.png b/manufacturing/management/media/subcontract_06.png deleted file mode 100644 index 5f3fd32ea..000000000 Binary files a/manufacturing/management/media/subcontract_06.png and /dev/null differ diff --git a/manufacturing/management/media/subcontract_01.png b/manufacturing/management/media/subcontracting_01.png similarity index 100% rename from manufacturing/management/media/subcontract_01.png rename to manufacturing/management/media/subcontracting_01.png diff --git a/manufacturing/management/media/subcontract_03.png b/manufacturing/management/media/subcontracting_02.png similarity index 100% rename from manufacturing/management/media/subcontract_03.png rename to manufacturing/management/media/subcontracting_02.png diff --git a/manufacturing/management/media/subcontract_04.png b/manufacturing/management/media/subcontracting_03.png similarity index 100% rename from manufacturing/management/media/subcontract_04.png rename to manufacturing/management/media/subcontracting_03.png diff --git a/manufacturing/management/media/subcontract_05.png b/manufacturing/management/media/subcontracting_04.png similarity index 100% rename from manufacturing/management/media/subcontract_05.png rename to manufacturing/management/media/subcontracting_04.png diff --git a/manufacturing/management/media/subcontracting_05.png b/manufacturing/management/media/subcontracting_05.png new file mode 100644 index 000000000..ca9149df8 Binary files /dev/null and b/manufacturing/management/media/subcontracting_05.png differ diff --git a/manufacturing/management/media/subcontracting_06.png b/manufacturing/management/media/subcontracting_06.png new file mode 100644 index 000000000..ce1106a45 Binary files /dev/null and b/manufacturing/management/media/subcontracting_06.png differ diff --git a/manufacturing/management/media/subcontracting_07.png b/manufacturing/management/media/subcontracting_07.png new file mode 100644 index 000000000..453863fcf Binary files /dev/null and b/manufacturing/management/media/subcontracting_07.png differ diff --git a/manufacturing/management/media/subcontracting_08.png b/manufacturing/management/media/subcontracting_08.png new file mode 100644 index 000000000..daec4f6ac Binary files /dev/null and b/manufacturing/management/media/subcontracting_08.png differ diff --git a/manufacturing/management/media/subcontracting_09.png b/manufacturing/management/media/subcontracting_09.png new file mode 100644 index 000000000..a4d4c1cd9 Binary files /dev/null and b/manufacturing/management/media/subcontracting_09.png differ diff --git a/manufacturing/management/media/subcontract_07.png b/manufacturing/management/media/subcontracting_10.png similarity index 100% rename from manufacturing/management/media/subcontract_07.png rename to manufacturing/management/media/subcontracting_10.png diff --git a/manufacturing/management/media/subcontract_08.png b/manufacturing/management/media/subcontracting_11.png similarity index 100% rename from manufacturing/management/media/subcontract_08.png rename to manufacturing/management/media/subcontracting_11.png diff --git a/manufacturing/management/subcontracting.rst b/manufacturing/management/subcontracting.rst index 135866f5c..2555caa03 100644 --- a/manufacturing/management/subcontracting.rst +++ b/manufacturing/management/subcontracting.rst @@ -2,8 +2,8 @@ Subcontract the manufacturing ============================= -Some businesses subcontract the production of some finished products -through subcontractors. This can be easily managed through Odoo. +Some businesses subcontract the production of finished products through +subcontractors. This can be easily managed through Odoo. Configuration ============= @@ -11,26 +11,23 @@ Configuration Go to the :menuselection:`Manufacturing app --> Configuration --> Settings` and tick the box *Subcontracting*. -.. image:: media/subcontract_01.png +.. image:: media/subcontracting_01.png :align: center You can now define subcontracted *Bill of Materials*. Therefore, you need to go to :menuselection:`Manufacturing --> Master Data --> Bill of Materials` and hit *Create*. In this *BoM*, list the components which will be used by the subcontractor to manufacture the subcontracted -finished product. Specify that the *BoM* type is *Subcontracting*. +finished product. Specify that the *BoM* type is *Subcontracting* and define one or +several subcontractors who will provide you the product. -.. image:: media/subcontract_03.png +.. image:: media/subcontracting_02.png :align: center -You can also define subcontractors on the BoM. - -- If no subcontractor is set, the BoM can be used by any subcontractor - -- If some are set, the BoM can only be used for those subcontractors - -.. image:: media/subcontract_04.png +.. image:: media/subcontracting_03.png :align: center +And... the configuration part is already done! + Receive or buy a subcontracted product ====================================== @@ -47,7 +44,7 @@ unit price should be the cost you are paying to the subcontractor for the subcontracting (thus, it’s not necessarily the total cost of the subcontracted product). -.. image:: media/subcontract_05.png +.. image:: media/subcontracting_04.png :align: center The validation of the purchase order automatically creates the receipt. @@ -72,32 +69,55 @@ valued in your stock. For option B, you can simply create the receipt manually with a partner of type subcontractor defined on it. +Receive or buy a subcontracted product with tracked components +============================================================== + +In case the subcontracted product you receive from your subcontractor +contains tracked components, you will need to specify the *serial/lot +numbers* of the components in question for traceability. This operation +is included in the receipt of the subcontracted product. + +On the receipt, you see a *Record Components* button appearing when +necessary. If you click on it, a *Produce* wizard opens in which you +will have to enter the *serial/lot numbers* of the components, and the +finished product if it is also tracked, like in the below example. + +.. image:: media/subcontracting_05.png + :align: center + +.. image:: media/subcontracting_06.png + :align: center + +Once this information has been entered, you will see a new icon on the +receipt stock move, which will allow you to find back the components +which are part of the finished product. + +.. image:: media/subcontracting_07.png + :align: center + Resupply the subcontractor with the components ============================================== There are 3 ways to manage the resupply of your subcontractor with the components: -- **Manually**: You create a delivery order in which you set the - subcontractor as a partner and you choose the components to - deliver. +- **Manually**: You create a delivery order in which you set the subcontractor as a partner and you choose the components to deliver. -.. image:: media/subcontract_06.png +.. image:: media/subcontracting_08.png :align: center -- **With reordering rules**: You can define a *reordering rule* - on the *Subcontracting location* to ensure that they are always - enough components sent to your subcontractors. When the - reordering rule is triggered, a delivery order is created for the - product is automatically created. +.. note:: + You therefore need to activate *Multi-locations* in the inventory settings. -.. image:: media/subcontract_07.png +.. image:: media/subcontracting_09.png :align: center -- **On order**: You can also deliver the components to your - subcontractors each time you order a subcontracted product. For - this, you need to tick the route *Resupply Subcontractor on - Order* on the wanted components. +- **With reordering rules**: You can define a *reordering rule* on the *Subcontracting location* to ensure that they are always enough components sent to your subcontractors. When the reordering rule is triggered, a delivery order is created for the product is automatically created. -.. image:: media/subcontract_08.png +.. image:: media/subcontracting_10.png :align: center + +- **On order**: You can also deliver the components to your subcontractors each time you order a subcontracted product. For this, you need to tick the route *Resupply Subcontractor on Order* on the wanted components. + +.. image:: media/subcontracting_11.png + :align: center \ No newline at end of file