[REF] mrp: documentation update

- Updated Pictures with latest version, deleted old ones
- Added Quality Control section
- Deleted Kit Routings section
- Adapted Terminology, specifically work orders vs routings

closes odoo/documentation#1460

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>

content/applications/inventory_and_mrp/manufacturing/management.rst

@@ -8,10 +8,10 @@ Manufacturing Management
    :titlesonly:
 
    management/bill_configuration
-   management/kit_shipping
    management/product_variants
+   management/kit_shipping
    management/sub_assemblies
+   management/quality_control
    management/alternative_wc
    management/subcontracting
-   management/routing_kit_bom
-   management/use_mps
+   management/use_mps

content/applications/inventory_and_mrp/manufacturing/management/alternative_wc.rst

@@ -1,80 +1,66 @@
 ================================
-Using an alternative Work Center
+Alternative Work Centers
 ================================
 
-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.
+Manufacturing several different products simultaneously at the same work center
+is a common issue for manufacturing companies. Although in practice, employees can 
+manufacture the goods at another work center instead of waiting for one to be available, 
+it's not always simple to have visibility on which work center is busy and plan resources 
+accordingly in real-time.
 
-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.
+With Odoo, you can configure alternative work centers to solve this issue. This automatically
+checks which work center is busy and which equivalent ones are free, and schedules orders and
+maintenance accordingly.
 
-This way, your process becomes more efficient, and less non-productive
-time will be noticed.
+This way, your process becomes more efficient, as work center utilisation is optimised. 
 
 
 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.
+First, go to the :menuselection:`Manufacturing app --> Configuration --> Settings`. Then, enable
+the Work Orders feature and hit save.
+
+.. image:: media/bom_3.png
+    :align: center
+    :alt: work order settings ticked
 
 
-.. image:: media/alternative_wc_01.png
+Now, go to :menuselection:`Configuration --> Work Centers` and create
+two new work centers. Add the second work center as an alternative to
+the first one and vice versa.
+
+
+.. image:: media/wc_alternate1.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.
+Next, go to :menuselection:`Products --> Bills of Materials`, choose your product, 
+and add these work centers to the operations of your BOM.
 
 
-.. image:: media/alternative_wc_02.png
+.. image:: media/wc_alternate2.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
-
+Go to :menuselection:`Operations --> Manufacturing Orders`, and hit **Create**. There, add
+your product to your manufacturing order and plan it. You can then retrieve them 
+from the Work Orders list view, under Operations > Work Orders.
 
 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.
+configured, as shown below. 
 
-
-.. image:: media/alternative_wc_06.png
+.. image:: media/wc_alternate3.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.
+         if the usual one is free. 

content/applications/inventory_and_mrp/manufacturing/management/bill_configuration.rst

@@ -3,92 +3,89 @@ Create Bills of Materials
 =========================
 
 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.
+component required to make or deliver a finished product. Additionally, it 
+can also include various operations and individual step guidelines
+needed to complete a production process. 
 
-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.
+With Odoo's MRP solution, multiple BOMs can also be linked to each product,
+so that even product variants can have their *own* tailored BOM.
 
-This feature will help optimize your manufacturing process while saving
-you time.
+This will help you to optimize your manufacturing process and save time 
+as a result. 
 
 Setting up a BoM
 ================
+The simplest BoM set up is one without operations or instructions. 
+In this case, you will manage your production using Manufacturing Orders
+only.
 
-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.
+To create a BoM from the Manufacturing module, go to :menuselection:`Products --> Bills of Materials`. 
+If you click **Create**, the first thing you'll have to do is to specify the final product. 
+For an existing product, simply select it from the list, or create a new one on the spot. Note 
+that if you go through the product form to create your BOM, the product will already be set for you.
 
-Before creating your *BoM*, you have to create the product using the
-*BoM* and, at least, one of the components. Go to the :menuselection:`Master Data menu --> Products`
-and create both the finished product and the component.
+For a standard Bill of Material, keep the default *BoM* type, which is *Manufacture this Product*. 
+Now specify the various components that make up the production of your final product and their 
+respective quantities. You can create components as you go, on the BOM, or create products beforehand,
+by going to the :menuselection:`Top Menu --> Products --> Create`, and add them later on. 
 
-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
+.. image:: media/bom_1.png
     :align: center
 
-.. warning::
-   The destination location should **not** be a scrap location. A scrap location is where you put
-   products that you don't need. 
-
 Using the same BoM to describe Variants
 ---------------------------------------
 
-As said above, you can use *BoM* for *Product Variants*. It is
-basically the same as for the standard product.
+As suggested above, you can use *BOMs* for specific *Product Variants*. 
+Once the various attributes have been configured on the product form, there 
+are two ways to configure the appropriate BoM for the respective product combination. 
 
-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.
+Either create one BoM per variant, by specifying the Product Variant
+in the dedicated field below the product name. Or use one BOM, that contains
+all of the components and for each component, indicate which variant it applies to, 
+using the *Apply on Variants* column, as shown below. 
 
-.. image:: media/bills_of_materials_02.png
+.. image:: media/bom_2.png
     :align: center
 
-Adding a routing
-================
 
-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.
+Adding Operations
+=================
 
-.. image:: media/bills_of_materials_03.png
+You can also add operations to your *BoM*, if you want workers to follow instructions
+or register time spent. To use this feature, enable the *Work Orders* feature in the 
+*Manufacturing* app settings, as shown below.
+
+.. image:: media/bom_3.png
     :align: center
 
 .. note::
-         Each *BoM* can have only one routing while each routing can be used
-         multiple times.
+         Each operation is unique as it is always linked to only one BOM. This being said, 
+         Operations Operations can be re-used when configuring a new BOM, with the *Copy Existing 
+         Operations* feature.
 
-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.
-
-.. image:: media/bills_of_materials_04.png
+.. image:: media/bom_4.png
     :align: center
 
+Finally, just like for components, operations can also be variant specific only, as shown below.
+
+.. image:: media/bom_5.png
+    :align: center
+
+
+
 Adding By-Products
 ==================
 
-In Odoo, a *by-product* is any product produced by a *BoM* in
-addition to the primary product.
+A *by-product* is a product that is produced on top of the main product 
+of a *BoM*. As opposed to the primary product, there can be more than one on a BOM. 
 
-To add *by-products* to a *BoM*, you will first need to enable them
-from the *Manufacturing* app settings.
+To add *by-products* to a *BoM*, you will first need to enable the by-product
+feature from the *Manufacturing* app settings.
 
-.. image:: media/bills_of_materials_05.png
+.. image:: media/bom_6.png
     :align: center
 
-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.
-
-.. image:: media/bills_of_materials_06.png
-    :align: center
+Once the feature is enabled, you can add *by-products* to your
+*BoMs*. Note that if you have Operations, you'll need to specify 
+in which operation the by-product is produced. 

content/applications/inventory_and_mrp/manufacturing/management/kit_shipping.rst

@@ -1,81 +1,87 @@
-=============================
-Sell sets of products as kits
-=============================
+=====
+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 the stock of the kit product is to be managed. In either case,
-both the *Inventory* and *Manufacturing* apps must be installed.
+A *kit* is a set of components that are not pre-assembled or mixed. This is useful for
+selling but also for creating cleaner and more effective *BOMs*. To use kits, you need 
+both the Manufacturing and Inventory apps to be installed. 
 
 Manage Stock of Component Products
 ==================================
 
-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.
+If you want to assemble kits as they are ordered, managing stock of the kit components only, 
+you will use a *Kit BoM* Type without any manufacturing operations. 
 
-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 first image shows a sales order for the kit *Custom Computer Kit*,
+A product using a *Kit BoM* will appear as a single line item on a quotation and a 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 first image shows a sales order for the kit *Custom Computer Kit*,
 while the second image shows the corresponding delivery order.
 
-.. image:: media/kit_shipping_01.png
+.. image:: media/kit-so-line.png
     :align: center
 
-.. image:: media/kit_shipping_02.png
+.. image:: media/kit-do-picking.png
     :align: center
 
 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.
+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. Because
+you cannot track the stock of kit products, the *Product Type* should be set to *Consumable*. 
+However, if you are using Anglo-Saxon accounting, and you would like COGS to be posted when 
+invoicing your kits (and only for this reason), the storable product type should selected instead. 
+Because a kit product cannot be purchased, *Can be Purchased* should be unchecked. The route of the
+kit product in the *Inventory* Tab does not really matter, as, for replenishment, only the route of 
+the components that will be taken into account only. 
 
-All other parameters on the kit product may be modified according to
-your preference. The component products require no particular
-configuration.
+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* Kit. All other options may be left with their default values.
 
-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
+.. image:: media/kit-bom.png
     :align: center
 
 Manage Stock of Kit Product and Component Products
 ==================================================
 
-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.
+If you want to manage the stock of the *top-level kit product*, you will use a standard *BoM Type* 
+manufacture or subcontracting instead. In this case you will either buy the final product from your
+subcontractor, or make it yourself through a manufacturing order. 
 
-Configuration
-=============
+In that case the product type will be storable, and the BOM type either 'Manufacture this product' 
+or 'Subcontracting' as shown below.
 
-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_shipping_05.png
+.. image:: media/kit-storable.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.
 
-.. image:: media/kit_shipping_06.png
-    :align: center
+Build a cleaner BOM
+==================== 
+
+As suggested above, a kit BOM can also simply be used to manage a more complex BOM. 
+
+Imagine the Custom Computer parts above were part of another final product. It would be much 
+clearer and simpler if the BOMs were added together (as shown below) instead of adding all 
+the individual parts one by one.
+
+.. image:: media/kit-bom4.png
+    :align: center
+
+This is even better illustrated when looking at the BOM Structure Report, where it is 
+easy to expand and hide specific kit level or sub-assembly type BOMs. 
+
+.. image:: media/kit-bom5.png
+    :align: center
+
+On the creation of the manufacturing order, the BOM will automatically expand to show all
+top level and kit level components. You can go back to the BOM at any point though as it 
+remains  available on the form view of your manufacturing order. 
+
+.. image:: media/kit-bom6.png
+    :align: center
+
+Finally, note that if there were any Operations in the Kit BOM, these would also simply be added 
+in to the work order list of the main component.