Merge branch '13.0' into 13.0.mrp-routing_kit_bom-lau

manufacturing/management/alternative_wc.rst

@@ -0,0 +1,80 @@
+================================
+Using an alternative Work Center
+================================
+
+For many manufacturing companies, a common issue is to have to
+manufacture, at the same time, several products usually produced at the
+same work center. If in practice, employees can manufacture the goods at
+another work center, it is not that simple.
+
+You need to keep track of the job: which work center has been used and
+when, so you can schedule maintenance efficiently. With Odoo, you can
+configure it so you can keep tracking manufacturing orders and your
+employees have an alternative work center to use.
+
+This way, your process becomes more efficient, and less non-productive
+time will be noticed.
+
+
+Configure your Work Centers
+===========================
+
+The first thing to do is to go to the *Manufacturing* app settings.
+Then, enable the *Work Orders* feature and hit save.
+
+
+.. image:: media/alternative_wc_01.png
+    :align: center
+
+
+Now, go to the *Work Centers* menu under *Master Data* and create
+two new work centers. Add the second work centers as an alternative to
+the first and vice versa.
+
+
+.. image:: media/alternative_wc_02.png
+    :align: center
+
+
+The next step is to create your *routing*. Add your work center and an
+operation to it before saving.
+
+
+.. image:: media/alternative_wc_03.png
+    :align: center
+
+
+Then, you can create your *Bill of Materials* and add components and
+routing to it.
+
+
+.. image:: media/alternative_wc_04.png
+    :align: center
+
+
+Create your Work Orders
+=======================
+
+Now that everything is configured, you can create your *Work Orders*.
+Go to the *Manufacturing Orders* menu and hit *Create*. There, add
+your product and plan it. In the *Work Orders* list, you can find it
+ready to be assembled.
+
+
+.. image:: media/alternative_wc_05.png
+    :align: center
+
+
+Each new *Work Order*, which will be created before the end of the
+first one, will be scheduled at the alternative work center you
+configured.
+
+
+.. image:: media/alternative_wc_06.png
+    :align: center
+
+
+.. note::
+         Keep in mind that, if you add time after production to your work center,
+         you may have work orders scheduled for your alternative work center even
+         if the usual one is free.

manufacturing/management/bill_configuration.rst

@@ -1,140 +1,91 @@
-=================================
-How to create a Bill of Materials
-=================================
-
-A bill of materials (BoM) is a document that describes the component
-products, the quantity of each component, and the process required to
-manufacture a product, including a routing and individual steps.
-
-In Odoo, each product may have multiple BoMs associated with it, but a
-BoM can only be associated with a single product. A single BoM can,
-however, describe multiple variants of the same product.
-
-Setting up a Basic BoM
-======================
-
-If you choose to manage your manufacturing operations using manufacturing
-orders only, you will define basic bills of materials without routings.
-
-Before creating your first bill of materials, you will need to create a
-product and at least one component (components are considered products
-in Odoo). You can do so from :menuselection:`Master Data --> Products`, or
-on the fly from the relevant fields on the BoM form. Review the
-Inventory chapter for more information about configuring products. Once
-you have created a product and at least one component, select them from
-the relevant dropdown menus to add them to your bill of materials. A new
-bill of materials can be created from :menuselection:`Master Data --> Bills of Materials`,
-or using the button on the top of the product form.
-
-Under the **Miscellaneous** tab, you can fill additional fields.
-**Sequence** defines the order in which your BoMs will be selected
-for production orders, with lower numbers having higher priority.
-**Version** allows you to track changes to your BoM over time.
-
-Adding a Routing to a BoM
+=========================
+Create Bills of Materials
 =========================
 
-A routing defines a series of operations required to manufacture a
-product and the work center at which each operation is performed. A
-routing may be added to multiple BoMs, though a BoM may only have one
-routing. For more information about configuring routings, review the
-chapter on routings.
+A *Bill of Materials* is a document defining the quantity of each
+component required to manufacture a finished product. It also includes
+the routing and individual steps of the manufacturing process.
 
-After enabling routings from :menuselection:`Configuration --> Settings`,
-you will be able to add a routing to a bill of materials by selecting a
-routing from the dropdown list or creating one on the fly.
+With Odoo, you can link multiple BoMs to each product and use it to
+describe multiple variants of them. Each BoM will, yet, be associated
+with one product only.
 
-You may define the work operation or step in which each component is
-consumed using the field, **Consumed in Operation** under the
-**Components** tab. Similarly, you can define the operation at which the
-product will be produced under the **Miscellaneous** tab using the field
-**Produced at Operation**. If this field is left blank, the products
-will be consumed/produced at the final operation in the routing.
+This feature will help optimize your manufacturing process while saving
+you time.
 
-.. image:: media/bill_configuration01.png
+Setting up a BoM
+================
+
+You can use BoMs without routings. You will use this if you choose to
+manage your manufacturing operations using manufacturing orders only. In
+other words, you choose to realize your manufacturing process in one
+step and do not track the steps the product goes through.
+
+Before creating your *BoM*, you have to create the product using the
+*BoM* and, at least, one of the components. Go to the *Master Data*
+menu > *Products* and create both the finished product and the
+component.
+
+Once done, go to the *Bills of Materials* menu under *Master Data*.
+Now, create it. Choose the product from the dropdown menu and add your
+components and the quantity. In this case, keep the default *BoM*
+type, which is *Manufacture this Product*.
+
+.. image:: media/bills_of_materials_01.png
     :align: center
 
-Adding Byproducts to a BoM
-==========================
+Using the same BoM to describe Variants
+---------------------------------------
 
-In Odoo, a byproduct is any product produced by a BoM in addition to the
-primary product.
+As said above, you can use *BoM* for *Product Variants*. It is
+basically the same as for the standard product.
 
-To add byproducts to a BoM, you will first need to enable them from
-:menuselection:`Configuration --> Settings`. 
+If your *BoM* is for one variant only, then specify which one in the
+*Product Variant* field. If not, specify the variant it is consumed
+for on each component line. You can add several variants for each
+component.
 
-.. image:: media/bill_configuration02.png
+.. image:: media/bills_of_materials_02.png
     :align: center
 
-Once byproducts are enabled, you can add them to your bills of materials
-under the **Byproducts** tab of the bill of materials. You can add
-any product or products as byproducts. Byproducts are produced in the
-same step of the routing as the primary product of the BoM.
+Adding a routing
+================
 
-.. image:: media/bill_configuration03.png
+You can add routing to your *BoM*. You will do this if you need to
+define a series of operations required by your manufacturing process. To
+use it, enable the *Work Orders* feature in the *Manufacturing* app
+settings.
+
+.. image:: media/bills_of_materials_03.png
     :align: center
 
-Setting up a BoM for a Product With Sub-Assemblies
-==================================================
+.. note::
+         Each *BoM* can have only one routing while each routing can be used
+         multiple times.
 
-A subassembly is a manufactured product which is intended to be used as
-a component of another manufactured product. You may wish to employ
-sub-assemblies to simplify a complex BoM, to more accurately represent
-your manufacturing flow, or to use the same subassembly in multiple
-BoMs. A BoM that employs subassemblies is often referred to as a
-multi-level BoM.
+Now that you have created your routing, add it to your *BoM*. You can
+select when, in the work operations, your components are consumed with
+the dropdown menu.
 
-Multi-level bills of materials in Odoo are accomplished by creating a
-top-level BoM and subassembly BoMs. Next, the procurement route of the
-subassembly product is defined. This ensures that every time a
-manufacturing order for the top-level product is created, a
-manufacturing order for each subassembly is created as well.
-
-Configure the Top-Level Product BoM
------------------------------------
-
-To configure a multi-level BoM, create the top-level product and its
-BoM. Include any subassemblies in the list of components. Create a BoM
-for each subassembly as you would for any product.
-
-.. image:: media/bill_configuration04.png
+.. image:: media/bills_of_materials_04.png
     :align: center
 
-Configure the Subassembly Product Data
---------------------------------------
+Adding By-Products
+==================
 
-On the product form of the subassembly, you must select the routes
-**Manufacture** and **Make To Order**. The **Manufacture**
-route takes precedence over the **Buy** route, so selecting the
-latter will have no effect. 
+In Odoo, a *by-product* is any product produced by a *BoM* in
+addition to the primary product.
 
-.. image:: media/bill_configuration05.png
+To add *by-products* to a *BoM*, you will first need to enable them
+from the *Manufacturing* app settings.
+
+.. image:: media/bills_of_materials_05.png
     :align: center
 
-If you would like to be able to purchase the subassembly in addition to
-manufacturing it, select **Can be Purchased**. All other fields on
-the subassembly product form may be configured according to your
-preference.
+Once the feature is enabled, you can add your *By-Products* to your
+*BoMs*. You can add as many *By-Products* as you want. Just keep in
+mind that you need to register during which operation your by-product is
+produced.
 
-Using a Single BoM to Describe Several Variants of a Single Product
-===================================================================
-
-Odoo allows you to use one bill of materials for multiple variants of
-the same product. Simply enable variants from
-:menuselection:`Configuration --> Settings`.
-
-.. image:: media/bill_configuration06.png
-    :align: center
-
-You will then be able to specify which component lines are to be used in
-the manufacture of each product variant. You may specify multiple
-variants for each line. If no variant is specified, the line will be
-used for all variants.
-
-When defining variant BoMs on a line-item-basis, the **Product
-Variant** field in the main section of the BoM should be left blank.
-This field is used when creating a BoM for one variant of a product
-only.
-
-.. image:: media/bill_configuration07.png
-    :align: center
+.. image:: media/bills_of_materials_06.png
+    :align: center

manufacturing/management/flexible_components_consumption.rst

@@ -0,0 +1,53 @@
+===================================
+Use flexible components consumption
+===================================
+
+Sometimes, you might need more components than usual to manufacture a
+product. Let’s say that you produce a desk combination of 4 desks and
+two chairs but your customer asks you one more desk. Alright, you can do
+that. But you will need to register it!
+
+In case this happens, Odoo has the *flexible components consumption*
+feature available. If you enable it, you will be able to consume as many
+components as needed and it will make you save time in the registration
+of your items consumption.
+
+Configuration
+=============
+
+Using flexible component consumption is easy and can be done in a few
+steps. All you need is a *BoM* and a *Quality Control Point*.
+Therefore, you will need to activate the feature *Quality* in the
+*MRP* app settings.
+
+First, open the *BoM* you want to use for flexible component
+consumption and edit it. In the *Miscellaneous* tab, choose
+*Flexible* as the consumption type. Then, save.
+
+.. image:: media/flexible_components_consumption_01.png
+    :align: center
+
+Now, in the *Quality* app, open the *Control Point* menu, under
+*Quality Control* and create a new *Quality Control Point*. Choose
+your product, your operation and work order operation. Then, choose
+*Register Consumed Materials* as type.
+
+.. image:: media/flexible_components_consumption_02.png
+    :align: center
+
+Next, go back to your *Manufacturing* app and create a *Manufacturing
+order*. Choose the product for which you have created the flexible
+*BoM*.
+
+Then, confirm it and launch the process step. While processing, you will
+have the possibility to consume more components than expected in the
+*BoM*. To do so, click on *Continue Consumption*.
+
+.. image:: media/flexible_components_consumption_03.png
+    :align: center
+
+When the job is over, you will find a summary of your component
+consumption in the *Finished Steps* tab of your work order.
+
+.. image:: media/flexible_components_consumption_04.png
+    :align: center

manufacturing/management/kit_shipping.rst

@@ -1,80 +1,81 @@
-======================================
-How to Sell a Set of Products as a Kit
-======================================
+=============================
+Sell sets of products as kits
+=============================
 
 A *kit* is a set of components that are delivered without first being
-assembled or mixed. Kits are described in Odoo using *bills of
-materials*. There are two basic ways to configure kits, depending on
-how stock of the kit product is to be managed. In either case, both the
-Inventory and Manufacturing apps must be installed.
+assembled or mixed. *Kits* are described in Odoo using *Bills of
+Materials*. There are two basic ways to configure *kits*, depending
+on how the stock of the kit product is to be managed. In either case,
+both the *Inventory* and *Manufacturing* apps must be installed.
 
 Manage Stock of Component Products
 ==================================
 
-If you would like to assemble kits as they are ordered, managing stock
-of the kit *components* only, you will use a Kit BoM without a
-manufacturing step.
+If you want to assemble kits as they are ordered, managing stock of the
+kit components only, you will use a *Kit BoM* without a manufacturing
+step.
 
-A product using a Kit BoM will appear as a single line item on a
+A product using a *Kit BoM* will appear as a single line item on a
 quotation and sales order, but will generate a delivery order with one
 line item for each of the components of the kit. In the examples below,
-the image at left shows a sales order for the kit "Custom Computer Kit",
-while the image at right shows the corresponding delivery order.
+the first image shows a sales order for the kit *Custom Computer Kit*,
+while the second image shows the corresponding delivery order.
 
-|image0|\ |image1|
-
-Configuration
--------------
-
-From the **Products** menu in either the Inventory or Manufacturing
-app, create each component product as you would any other product, then
-create the top-level, or kit product. The kit product should have only
-the route **Manufacture** set. Because you cannot track the stock of
-kit products, the Product Type should be set to **Consumable**.
-Because a kit product cannot be purchased, **Can be Purchased**
-should be unchecked.
-
-All other parameters on the kit product may be modified according to
-your preference. The component products require no special
-configuration.
-
-.. image:: media/kit_shipping03.png
+.. image:: media/kit_shipping_01.png
     :align: center
 
-Once the products are configured, create a bill of materials for the kit
-product. Add each component and its quantity. Select the BoM Type
-**Ship this product as a set of components**. All other options may
-be left with their default values.
+.. image:: media/kit_shipping_02.png
+    :align: center
 
-.. image:: media/kit_shipping04.png
+Configuration
+=============
+
+From the *Products menu* in either the *Inventory* or
+*Manufacturing* app, create each component product as you would with
+any other product, then create the top-level, or kit product. The kit
+product should have only the *route Manufacture* set, in the
+*Inventory tab*. Because you cannot track the stock of kit products,
+the *Product Type* should be set to Consumable. Because a kit product
+cannot be purchased, then, *Can be Purchased* should be unchecked.
+
+All other parameters on the kit product may be modified according to
+your preference. The component products require no particular
+configuration.
+
+.. image:: media/kit_shipping_03.png
+    :align: center
+
+Once the products are configured, create a *bill of materials* for the
+kit product. Add each component and its quantity. Select the *BoM Type
+Ship this product as a set of components*. All other options may be
+left with their default values.
+
+.. image:: media/kit_shipping_04.png
     :align: center
 
 Manage Stock of Kit Product and Component Products
 ==================================================
 
-If you would like to manage stock of the top-level kit product, you will
-use a standard BoM with a manufacturing step instead of a Kit BoM. When
-using a standard BoM to assemble kits, a manufacturing order will be
-created. The manufacturing order must be registered as completed before
-the kit product will appear in your stock.
+If you want to manage stock of the *top-level kit product*, you will
+use a standard *BoM* with a manufacturing step instead of a *Kit
+BoM*. When using a standard BoM to assemble kits, a *manufacturing
+order* will be created. The *manufacturing order* must be registered
+as completed before the kit product will appear in your stock.
 
 Configuration
--------------
+=============
 
-On the kit product, select the route **Manufacture**. You may also
-select **Make to Order**, which will create a manufacturing order
-whenever a sales order is confirmed. Select the product type
-**Stockable Product** to enable stock management.
+On the kit product, select the *route Manufacture*. You may also
+select *Make to Order*, which will create a *manufacturing order*
+whenever a sales order is confirmed. Select the product type *Storable
+Product* to enable stock management.
 
-.. image:: media/kit_shipping05.png
+.. image:: media/kit_shipping_05.png
     :align: center
 
-When you create the bill of materials, select the BoM Type
-**Manufacture this product**. The assembly of the kit will be
-described by a manufacturing order rather than a packing operation.
+When you create the *bill of materials*, select the BoM Type
+*Manufacture this product*. The assembly of the kit will be described
+by a *manufacturing order* rather than a packing operation.
 
-.. image:: media/kit_shipping06.png
-    :align: center
-
-.. |image0| image:: ./media/kit_shipping01.png
-.. |image1| image:: ./media/kit_shipping02.png
+.. image:: media/kit_shipping_06.png
+    :align: center

manufacturing/management/manufacturing_order.rst

@@ -1,56 +1,75 @@
-====================================
-How to process a manufacturing order
-====================================
+============================
+Process Manufacturing Orders
+============================
 
-Introduction
-============
+In Odoo, you can manage your manufacturing process in two different
+ways. You can work with one document, or decide to have more information
+and control over it.
 
-There are two basic ways to manage manufacturing in Odoo. The first way
-manages work with one document only. This document is the
-**manufacturing order**. The second way uses additional documents to
-give you more precise control over the manufacturing process. In this
-way, **Manufacturing orders** are divided into one or more steps
-defined by **work orders**, performed in an order defined by
-**routings**.
+In the first case, Odoo makes things easier and helps you manage work
+with one document only: the manufacturing order. No complex steps during
+the process, you just have to schedule the job and record the
+production.
 
-How to manage manufacturing without routings
-============================================
+But, if you need more control, you can use additional documents (steps)
+to your manufacturing process. This way, *Manufacturing Orders* are
+divided into one or more steps defined by *Work Orders* and performed
+in a sequence defined by *routings*.
 
-You will most likely use manufacturing orders without routings if all
-the work to produce your product is performed in one place, by one
-person, in one step, and/or you do not need the level of granular
-control afforded by work orders and routings.
+Using Odoo will allow you to precisely schedule the job, analyze your
+efficiency but also have ease when realizing each step of your
+manufacturing process.
 
-Managing your operations in this way is the default behavior in Odoo.
-There are two basic phases from planning to production:
+Manage Manufacturing Without Routings
+=====================================
 
-1. Create manufacturing orders
+If your manufacturing process is limited to one place, one person and
+one step, you will probably use manufacturing orders without routings.
 
-2. Record Production
+In Odoo, it is the default behavior. If work this way, there are two
+basic phases from planning to production:
 
-How to manage manufacturing with routings and work orders
-=========================================================
+-  Create a manufacturing order
 
-To use work orders and routings, you will need to enable the option
-**Manage production by work orders** From
-:menuselection:`Configuration --> Settings`. You will then be able to add
-routings to bills of materials, and configure some additional related
-fields. You will also be able to create **work centers**, the
+-  Record the production
+
+Manage Manufacturing with Routings and Work Centers
+===================================================
+
+To use *Work Centers* and *Routings*, you will need to enable the
+*Work Orders* feature. To do so, go to the *Manufacturing* app
+settings.
+
+.. image:: media/process_manufacturing_orders_01.png
+    :align: center
+
+Now, you can add routings to *BoMs* and configure your operations
+taking place at different *work centers*. The *Work Centers* are the
 locations at which work orders are performed.
 
-When manufacturing with routings and work orders, each work order is
-scheduled individually. You will also have access to time and capacity
-planning, and reports on costing and efficiency on a work center level.
+.. image:: media/process_manufacturing_orders_02.png
+    :align: center
 
-Manufacturing using routings can be broken down into several steps. When
-configuring your BoM, you will need to add a routing defining the
-component work orders. After planning the manufacturing order, you will
-have the added step of scheduling work orders.
+When manufacturing this way, each *Work Order* is scheduled
+individually. You will also have access to time and capacity planning,
+as well as reports on costing and efficiency for each *Work Center*.
 
-The workflow is thus divided into three basic phases, as follows:
+.. image:: media/process_manufacturing_orders_03.png
+    :align: center
 
-1. Create manufacturing orders
+Thus, the workflow is divided into three basic phases:
 
-2. Schedule the associated work orders.
+-  Create the manufacturing order
 
-3. Perform the scheduled work and record production.
+.. image:: media/process_manufacturing_orders_04.png
+    :align: center
+
+-  Schedule the associated work orders
+
+.. image:: media/process_manufacturing_orders_05.png
+    :align: center
+
+-  Perform the scheduled work and record production
+
+.. image:: media/process_manufacturing_orders_06.png
+    :align: center

manufacturing/management/plan_work_orders.rst

@@ -0,0 +1,52 @@
+================
+Plan Work Orders
+================
+
+In some cases, companies need to schedule their work orders. Doing so,
+they can organize the work for the whole day and be sure everything goes
+well. It helps to avoid scheduling multiple work orders at the same time
+when you don’t have the capacity to do so.
+
+With Odoo, companies can schedule the planned start date for their
+manufacturing orders. No possible duplication, no potential issues with
+the planning. And, if you plan two work orders at the same work center,
+at the same hour, the second one will be scheduled right after the first
+one, avoiding work superposition.
+
+Create the Work Orders
+======================
+
+The first thing you need to do is to open the *Manufacturing* app.
+Then, Go to the settings and enable the *Work Orders* feature.
+
+.. image:: media/plan_work_order_01.png
+    :align: center
+
+Now, go to the *Manufacturing Orders* menu and hit *Create*. Choose
+your product and add a *Planned Start Date*.
+
+.. image:: media/plan_work_order_02.png
+    :align: center
+
+.. note::
+		The “Deadline Start” field is informative. It shows you until when you
+		can launch the manufacturing order to fulfill the initial demand.
+
+Mark your *Manufacturing Order* as todo and plan it. By going to the
+*Planning* menu, you can access to the scheduled orders. Here is the
+one we just created:
+
+.. image:: media/plan_work_order_03.png
+    :align: center
+
+.. note:: 
+		If you plan two work orders at the same hour, the second one will be
+		scheduled after the first one if the jobs need to be done at the same
+		work center. The start date will, then, be automatically updated
+		considering the first free slot on the work center.
+
+If you overrun the planned date and begin the job later, you will have a
+track of it in the *Time Tracking* tab of your work order.
+
+.. image:: media/plan_work_order_04.png
+    :align: center

manufacturing/management/sub_assemblies.rst

@@ -1,42 +1,49 @@
-====================================
-How to manage semi-finished products
-====================================
+=============================
+Manage semi-finished products
+=============================
 
-A subassembly is a manufactured product which is intended to be used as
-a component of another manufactured product. You may wish to employ
-sub-assemblies to simplify a complex BoM, to more accurately represent
-your manufacturing flow, or to use the same subassembly in multiple
-BoMs. A BoM that employs subassemblies is often referred to as a
-multi-level BoM.
+In Odoo, you can use subassembly products to simplify a complex *Bill
+of Materials* or to represent your manufacturing flow more accurately.
+A *subassembly product* is a manufactured product that is used as a
+component to make another one.
 
-Multi-level bills of materials in Odoo are accomplished by creating a
-top-level BoM and subassembly BoMs. Next, the procurement route of the
-subassembly product is defined. This ensures that every time a
-manufacturing order for the top-level product is created, a
-manufacturing order for each subassembly is created as well.
+A *BoM* that employs *subassemblies* is referred to as a multi-level
+BoM. Those are accomplished by creating a *top-level BoM* and
+*subassembly ones*. This process requires a route that will ensure
+that every time a manufacturing order for the top-level product is
+created, another one will be for subassemblies.
 
-Configure the Top -Level Product BoM
-------------------------------------
+Configure the Subassembly Product
+=================================
 
-To configure a multi-level BoM, create the top-level product and its
-BoM. Include any subassemblies in the list of components. Create a BoM
-for each subassembly as you would for any product.
+To configure a *multi-level BoM*, you will need a top-level product
+but also its subassemblies. The first step is to create a product form
+for each of the subassemblies. Select the routes *Manufacture* and
+*Replenish on Order*. Now, hit save.
 
-.. image:: media/sub_assemblies01.png
+.. image:: media/semi-finished_products_01.png
     :align: center
 
-Configure the Subassembly Product Data
---------------------------------------
+In the *Bill of Materials* menu, under *Master Data*, create a new
+*Bill of Materials*. Choose the product you just created and add its
+components.
 
-On the product form of the subassembly, you must select the routes
-**Manufacture** and **Make To Order**. The **Manufacture**
-route takes precedence over the **Buy** route, so selecting the
-latter will have no effect.
-
-.. image:: media/sub_assemblies02.png
+.. image:: media/semi-finished_products_02.png
     :align: center
 
-If you would like to be able to purchase the subassembly in addition to
-manufacturing it, select **Can be Purchased**. All other fields on
-the subassembly product form may be configured according to your
-preference.
+Configure the Main BoM
+======================
+
+Now, you can configure the top-level product and its *BoM*. Include
+any subassemblies in the list of components.
+
+.. image:: media/semi-finished_products_03.png
+    :align: center
+
+Now, each time you will plan a manufacturing order for the top-level
+product, a manufacturing order will be created for the subassembly one.
+Then, you will have to manufacture the subassembly in order to make it
+available before manufacturing the finished product.
+
+.. image:: media/semi-finished_products_04.png
+    :align: center

manufacturing/management/subcontracting.rst

@@ -1,29 +1,35 @@
-Subcontract the manufacturing of some products 
-==============================================
+=============================
+Subcontract the manufacturing
+=============================
 
-Some business subcontract the production of some finished products
+Some businesses subcontract the production of some finished products
 through subcontractors. This can be easily managed through Odoo.
 
 Configuration
--------------
+=============
 
-Go in the :menuselection:`Manufacturing --> Configuration --> Settings` and tick the box *Subcontracting*.
+Go to the *Manufacturing app > Configuration > Settings* and tick the
+box *Subcontracting*.
 
-.. image:: media/subcontracting01.png
+.. image:: media/subcontract_01.png
     :align: center
 
 You can now define subcontractors contacts. When you purchase or receive
 products from a contact of type subcontractor, the correct stock moves
 are created to represent the subcontracting of the production.
 
-.. image:: media/subcontracting02.png
+.. image:: media/subcontract_02.png
     :align: center
 
-The next step is to create a Bill of Material of type *subcontracted*.
-In this BoM, list the components you need to supply to the
-subcontractor.
+.. tip::
+        You can set the subcontractor as a vendor in case you plan to buy him
+        the subcontracted products via purchase orders.
 
-.. image:: media/subcontracting03.png
+The next step is to create a *Bill of Material* of type
+*subcontracted*. In this *BoM*, list the components you need to
+supply to the subcontractor.
+
+.. image:: media/subcontract_03.png
     :align: center
 
 You can also define subcontractors on the BoM.
@@ -32,76 +38,77 @@ You can also define subcontractors on the BoM.
 
 -  If some are set, the BoM can only be used for those subcontractors
 
-.. image:: media/subcontracting04.png
+.. image:: media/subcontract_04.png
     :align: center
 
-The configuration part is already done!
-
 Receive or buy a subcontracted product
---------------------------------------
+======================================
 
-You have two options to trigger a the subcontracting of a product:
+You have two options to trigger the subcontracting of a product:
 
--  Option A: You can buy the subcontracted product from your
+-  **Option A**: You can buy the subcontracted product from your
        subcontractor
 
--  Option B: You can directly receive the subcontracted product
+-  **Option B**: You can directly receive the subcontracted product
 
 Let’s start with option A (option B is just a simpler version of it).
 
 Create a new purchase order. The vendor must be a subcontractor. The
 unit price should be the cost you are paying to the subcontractor for
-the subcontracting (it’s thus not necessarily the total cost of the
+the subcontracting (thus, it’s not necessarily the total cost of the
 subcontracted product).
 
-.. image:: media/subcontracting05.png
+.. image:: media/subcontract_05.png
     :align: center
 
-The validation of the purchase order creates automatically the receipt.
+The validation of the purchase order automatically creates the receipt.
 Whenever you receive the product, you can validate the receipt. The
 following stock moves are created:
 
 -  For the components
 
-    From Subcontracting To Production
+   -  From Subcontracting To Production
 
 -  For the subcontracted product
 
-    From Production to Subcontracting
+   -  From Production to Subcontracting
 
-    From Subcontracting to Stock
+   -  From Subcontracting to Stock
 
 The *Subcontracting Location* represents the place where the products
 are at your subcontractor’s warehouse. It is configured as an internal
 location, the components that are sent to the subcontractor are still
 valued in your stock.
 
-For option B, you simply can create the receipt manually with a partner
+For option B, you can simply create the receipt manually with a partner
 of type subcontractor defined on it.
 
 Resupply the subcontractor with the components
-----------------------------------------------
+==============================================
 
 There are 3 ways to manage the resupply of your subcontractor with the
 components:
 
--  Manually. You simply create a delivery order on which you set the
-       subcontractor as 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/subcontracting06.png
+.. image:: media/subcontract_06.png
     :align: center
 
--  With reordering rules. You can define a reordering rule on the
-       Subcontracting location to ensure that they are always enough
-       components send to your subcontractors.
+-  **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/subcontracting07.png
+.. image:: media/subcontract_07.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
-       components concerned.
+-  **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/subcontracting08.png
-    :align: center
+.. image:: media/subcontract_08.png
+    :align: center

manufacturing/management/use_mps.rst

@@ -0,0 +1,125 @@
+==================================
+Use the Master Production Schedule
+==================================
+
+The Master Production Schedule (MPS) is a valuable tool to plan your
+production based on your demand forecast.
+
+Configuration
+=============
+
+Go to the *Manufacturing app > Configuration > Settings* and activate
+the Master Production Schedule feature before hitting save.
+
+.. image:: media/use_mps_01.png
+    :align: center
+
+.. tip::
+        In the manufacturing settings, you can define the time range of your MPS (month/week/day) and the number of periods you want to display.
+
+Now, go in *Planning > Master Production Schedule* and click on add a
+product. You can now define your safety stock target (= the stock you
+want to have on hand at the end of the period) and the minimum and
+maximum quantities to replenish.
+
+.. image:: media/use_mps_02.png
+    :align: center
+
+.. tip::
+        The products are ordered in the MPS based on their sequence. You can
+        rearrange that sequence by going on the list of your products and
+        reorganize them with drag and drop.
+
+.. image:: media/use_mps_03.png
+    :align: center
+
+In the MPS view, you can decide which information you would like to show
+by clicking on *rows*. Some fields can be added to the view, such as
+*Actual demand*, which will show which quantity of products has
+already been ordered for the period, or *Available to Promise*, which
+allows you to know what can still be sold during the period (what you
+plan to replenish - what is already sold during the period). You can
+also decide to hide some information if it isn’t necessary.
+
+.. image:: media/use_mps_04.png
+    :align: center
+
+Estimate your demand and launch replenishment
+=============================================
+
+The next step is to estimate the demand for the period. This estimation
+should be entered in the row *Demand Forecast*. You can easily, at any
+time, compare the demand forecast with the actual demand (= confirmed
+sales). The demand forecast for a finished product will impact the
+indirect demand for its components.
+
+.. image:: media/use_mps_05.png
+    :align: center
+
+Then, the quantity to replenish for the different periods will be
+automatically computed. The replenishments you are supposed to launch
+based on your lead times (vendor lead time or manufacturing lead time)
+are displayed in green. You can now launch the replenishment by clicking
+on the replenish button.
+
+Depending on the configuration of the product (buy vs. manufacture),
+requests for quotations or manufacturing orders will be created. You can
+easily access those by clicking on the *Actual Replenishment* cell.
+
+.. image:: media/use_mps_06.png
+    :align: center
+
+.. image:: media/use_mps_07.png
+    :align: center
+
+In case you manually edit the *To replenish* quantity, a small cross
+will appear on the left. In case you want to go back to the
+automatically computed value given by Odoo, you can click the cross.
+
+.. image:: media/use_mps_08.png
+    :align: center
+
+Cells color signification
+=========================
+
+The cells, which are part of the *To replenish* line, can take
+different colors depending on the situation:
+
+-  **Green**: quantity of products which should be replenished to
+       reach the expected safety stock considering the demand forecast
+       and the indirect demand forecast.
+
+-  **Grey**: replenishment order has already been generated, and its
+       quantity still matches current data.
+
+-  **Red**: replenishment order has already been generated, and its
+       quantity was too high considering current data.
+
+-  **Orange**: replenishment order has already been generated, and
+       its quantity was too low considering current data.
+
+The *Forecasted stock* line can also contain red cells, which means
+the stock will be negative during the period in question.
+
+What if I have underestimated the demand?
+-----------------------------------------
+
+You can still increase the demand forecast. It will impact the quantity
+to replenish. The cell will become orange, and you’ll be able to launch
+a new replenishment.
+
+What if I have overestimated the demand?
+----------------------------------------
+
+You can decrease the demand forecast. The cell will become red to inform
+you that you’ve ordered more than planned. If you’re still able to do
+it, you can cancel some RFQ or MO manually.
+
+What if I wrongly added a product to the MPS?
+---------------------------------------------
+
+You can easily remove a product from the MPS by clicking the small bin
+on the right of its name.
+
+.. image:: media/use_mps_09.png
+    :align: center