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

Makefile

@@ -10,7 +10,7 @@ LESSOPTS      =
 
 # User-friendly check for sphinx-build
 ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed; then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively, you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
 endif
 
 # Internal variables.
@@ -27,15 +27,17 @@ _extensions/odoo/static/style.css: $(lessfiles)
 
 .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
 
+# Displays list of commands
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  clean      to delete the build"
 	@echo "  html       to make standalone HTML files"
 	@echo "  i18nhtml   to make standalone translated HTML files"
 	@echo "  dirhtml    to make HTML files named index.html in directories"
 	@echo "  singlehtml to make a single large HTML file"
 	@echo "  pickle     to make pickle files"
 	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
+	@echo "  htmlhelp   to make HTML files and an HTML help project"
 	@echo "  qthelp     to make HTML files and a qthelp project"
 	@echo "  devhelp    to make HTML files and a Devhelp project"
 	@echo "  epub       to make an epub"
@@ -53,9 +55,11 @@ help:
 	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
+# Deletes the build
 clean:
 	rm -rf $(BUILDDIR)/*
 
+# These commands are used to create files or run tests
 html: _extensions/odoo/static/style.css
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
@@ -79,23 +83,23 @@ singlehtml:
 pickle:
 	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
 	@echo
-	@echo "Build finished; now you can process the pickle files."
+	@echo "Build finished. Now you can process the pickle files."
 
 json:
 	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
 	@echo
-	@echo "Build finished; now you can process the JSON files."
+	@echo "Build finished. Now you can process the JSON files."
 
 htmlhelp:
 	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
 	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
+	@echo "Build finished. Now you can run HTML Help Workshop with the" \
 	      ".hhp project file in $(BUILDDIR)/htmlhelp."
 
 qthelp:
 	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
 	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
+	@echo "Build finished. Now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
 	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/UnderstandingAccountingForEntrepreneurs.qhcp"
 	@echo "To view the help file:"
@@ -118,7 +122,7 @@ epub:
 latex:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+	@echo "Build finished. The LaTeX files are in $(BUILDDIR)/latex."
 	@echo "Run \`make' in that directory to run these through (pdf)latex" \
 	      "(use \`make latexpdf' here to do that automatically)."
 
@@ -126,14 +130,14 @@ latexpdf:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo "Running LaTeX files through pdflatex..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+	@echo "pdflatex finished. The PDF files are in $(BUILDDIR)/latex."
 	cp $(BUILDDIR)/latex/*.pdf $(BUILDDIR)/html/
 
 latexpdfja:
 	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
 	@echo "Running LaTeX files through platex and dvipdfmx..."
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+	@echo "pdflatex finished. The PDF files are in $(BUILDDIR)/latex."
 
 text:
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@@ -156,7 +160,7 @@ info:
 	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
 	@echo "Running Texinfo files through makeinfo..."
 	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+	@echo "makeinfo finished. The Info files are in $(BUILDDIR)/texinfo."
 
 gettext:
 	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) locale/sources
@@ -171,12 +175,12 @@ changes:
 linkcheck:
 	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
 	@echo
-	@echo "Link check complete; look for any errors in the above output " \
+	@echo "Link check complete. Look for any errors in the above output " \
 	      "or in $(BUILDDIR)/linkcheck/output.txt."
 
 doctest:
 	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
+	@echo "Testing of doctests in the sources finished. Look at the " \
 	      "results in $(BUILDDIR)/doctest/output.txt."
 
 xml:

_static/coa-valuation-continental.js

@@ -225,7 +225,7 @@
     }, {
         label: "Vendor Invoice (PO €48, Invoice €50)",
         operations: [
-            {account: EXPENSES.PURCHASED_GOODS.code, debit: constant(48)},
+            {account: EXPENSES.PURCHASED_GOODS.code, debit: constant(50)},
             {account: ASSETS.TAXES_PAID.code, debit: constant(50 * 0.09)},
             {account: LIABILITIES.ACCOUNTS_PAYABLE.code, credit: constant(50 * 1.09)},
         ]

accounting/bank/feeds/synchronize.rst

@@ -86,10 +86,10 @@ from the accounting dashboard.
 Moreover, a transaction can be visible in your bank account but not being fetched
 by Yodlee. Indeed, the transaction in your bank account can have the status "pending"
 and not the status "posted". In that case, Yodlee won't import it, you will have to
-wait that the status changes. 
+wait till the status changes. 
 
 What is important to remember is that Yodlee is not a service fetching transactions
-in real time. This is a service to facilitate the import of the bank statement in the database. 
+in real time. This is a service to facilitate the import of the bank statements to the database. 
 
 Is the Yodlee feature included in my contract? 
 ----------------------------------------------
@@ -103,10 +103,10 @@ Some banks have a status "Beta", what does it mean?
 
 This means that Yodlee is only currently working on developing the synchronization
 with this bank. The synchronization could already work or it may need a bit more time
-to have a 100% working synchronization. Unfortunately, there is not much to do about
-except being patient. 
+to have a 100% working synchronization. Unfortunately, there is not much to do about it
+except for being patient. 
 
 All my past transactions are not in Odoo, why?
 ----------------------------------------------
 
-Yodlee only allows to fetch up transactions to 3 months in the past.
+Yodlee only allows to fetch transactions up to 3 months in the past.

accounting/bank/misc/batch.rst

@@ -66,9 +66,9 @@ From checks received to the bank
 Receive customer checks
 -----------------------
 
-Once your record checks received, record them on the bank account on
+Once your checks are received, record them on the bank account on
 which you plan to deposit them. Once you select the bank account (or
-check journal is you configured Odoo that way), Odoo proposes you to use
+check journal if you configured Odoo that way), Odoo proposes you to use
 a batch deposit. Select this option if you plan to deposit the check to
 your bank.
 
@@ -93,7 +93,7 @@ and create a new **Batch Deposit**.
 
 Select the bank, then select the payments (checks) you want to add in
 this deposit. By default, Odoo proposes you all the checks that have not
-been deposit yet. That way, you can verify that you do not forget or
+been deposited yet. That way you can verify that you do not forget or
 lost a check.
 
 .. image:: media/batch05.png
@@ -113,9 +113,9 @@ matches with the bank statement line.
 .. image:: media/batch06.png
    :align: center
 
-If you select a batch deposit, Odoo will automatically fills all the
+If you select a batch deposit, Odoo will automatically fill all the
 checks contained in this deposit for the matching. (2 checks were in
-this batch deposit the example below)
+the batch deposit in the example below)
 
 .. image:: media/batch07.png
    :align: center
@@ -129,7 +129,7 @@ I don't see the batch deposit link on bank statements?
 If you don't have a batch deposit link in your bank statement, there
 could be two reasons:
 
-- After having installed the batch deposit features, you need to reload
+- After having installed the batch deposit features you need to reload
   the page so that the browser is aware of this new feature. Just
   click the reload button of your browser.
 
@@ -142,5 +142,5 @@ If you have a smaller amount in your bank statement than the actual
 amount in your batch deposit, it probably means that one of your check
 has been refused.
 
-In this case, click on the line related to this check to remove it from
+In this case click on the line related to this check to remove it from
 the bank statement matching.

accounting/bank/misc/interbank.rst

@@ -18,8 +18,8 @@ Check your Chart of Accounts and default transfer account
 
 To handle internal transfers you need a transfer account in your charts
 of account. Odoo will generate an account automatically based on the
-country of your chart of account. To parameter your chart of account and
-check the default transfer account go into your the accounting module,
+country of your chart of account. To configure your chart of accounts and
+check the default transfer account go into the accounting module settings,
 select :menuselection:`Configuration --> Settings`.
 
 Your chart of accounts will be pre-installed depending on the country
@@ -61,8 +61,8 @@ We will now transfer 50.000 euros from our **Bank** to our **Bank BE57 0633
 Log an internal transfer
 ------------------------
 
-The first step is to register the internal paiement. To do so, go into
-your accounting dashboard. click on the **more** button of one of your banks
+The first step is to register the internal payment. To do so go into
+your accounting dashboard, click on the **more** button of one of your banks
 and select :menuselection:`New --> Internal transfer`. 
 
 .. image:: media/interbank01.png
@@ -96,7 +96,7 @@ statement of your bank.
    :align: center
 
 That is because we did not import the bank statement confirming the
-departure and arrival of the money. It's thus necessary to import your
+receiving and sending of the money. It's thus necessary to import your
 bank statement and reconcile the payment with the correct bank statement
 line. Once you receive your bank statements click the **new statement**
 button of the corresponding bank to import them.
@@ -117,16 +117,16 @@ The following window will open:
 .. image:: media/interbank09.png
    :align: center
 
-You need to choose counterparts for the paiement. Select the correct
-bank statement line corresponding to the paiement and click on the 
+You need to choose counterparts for the payment. Select the correct
+bank statement line corresponding to the payment and click on the 
 **reconcile** button. Close the statement to finish the transaction
 
 .. image:: media/interbank08.png
    :align: center
 
 The same steps will need to be repeated once you receive your second
-bank statement. Note that if you specify the correct amount, and the
-same memo in both bank statement and payment transaction then the
+bank statement. Note that if you specify the same amount and the
+same memo in both bank statements and payment transactions then the
 reconciliation will happen automatically.
 
 .. image:: media/interbank12.png

accounting/bank/reconciliation/use_cases.rst

@@ -5,22 +5,18 @@ Use cases in the bank reconciliation process?
 Overview
 ========
 
-Linking your bank statements with your accounting can be a lot of work.
-You need to find invoices back, relate payments and that amount of
-administration can cast a lot of time. Luckily, with Odoo you can very
-easily link your invoices or any other payment with your bank
-statements.
+Matching your bank statements with your accounting records can be a tedious task. You need to find the corresponding invoices, compare the amounts and partners' details with those in the bank statement. These steps can take a lot of time. Luckily, with Odoo you can very easily match your invoices or any other payment document with your bank statements.
 
-Two reconciliation processes exist in Odoo.
+Two options of the reconciliation process exist in Odoo.
 
-1. We can directly register a payment on the invoices
+1. We can directly specify the payment on the invoice
 2. We can reconcile open invoices with bank statements
 
 Configuration
 =============
 
-No special configuration is necessary to register invoices. All we need
-to do is install the accounting app.
+No special configuration is necessary to record invoices. All we need
+to do is to install the accounting app.
 
 .. image:: media/use01.png
    :align: center
@@ -31,13 +27,13 @@ Use cases
 Case 1: Payments registration
 -----------------------------
 
-We received the payment proof for our invoice of 2100 euros issued to
+We received the proof of payment of our invoice in the amount of 2100 euros issued to
 Smith & Co.
 
 We start at our issued Invoice of 2100 euros for Smith & Co. Because the
 sold product is a service we demand an immediate payment. Our accountant
-only handles the bank statements at the end of week, so we have to mark
-the invoice as paid so we can remember we can start the service with our
+only handles bank statements at the end of week, so we have to mark
+this invoice as paid immediately in order to indicate that we can start rendering services to our
 customer.
 
 Our customer send us a payment confirmation. We can thus register a
@@ -47,13 +43,13 @@ payment and mark the invoice as paid.
    :align: center
 
 By clicking on **register payment,** we are telling Odoo that our
-customer paid the Invoice. We thus have to specify the amount and the
-payment method
+customer has paid the Invoice. We thus have to specify the amount and the
+payment method.
 
 .. image:: media/use03.png
    :align: center
 
-We can always find the payment back from the Invoice by clicking on the
+Now we can always find the payment details in the Invoice by clicking on the
 :menuselection:`Info --> Open Payment`.
 
 .. image:: media/use04.png
@@ -71,8 +67,8 @@ assume that other Invoices are open for different customers.
 .. image:: media/use05.png
    :align: center
 
-We receive our bank statement and not only the invoice of Smith & Co has
-been paid, the one of Buzz of 92 euros as well.
+We receive our bank statement and find that not only the invoice issued to Smith & Co has
+been paid, but the one to Buzz of 92 euros as well.
 
 **Import** or **Create** the bank statements. Please refer to the
 documents from the Bank Feeds section.

accounting/localizations/mexico.rst

@@ -15,7 +15,7 @@ Introduction
 
 The mexican localization is a group of 3 modules:
 
-1. **l10n_mx:** All the basic data to manage the accounting, taxes and the
+1. **l10n_mx:** All basic data to manage the accounting, taxes and the
    chart of account, this proposed chart of account installed is a intended
    copy of the list of group codes offered by the `SAT`_.
 2. **l10n_mx_edi**: All regarding to electronic transactions, CFDI 3.2 and 3.3,
@@ -62,6 +62,8 @@ integrate with the normal invoicing flow in Odoo.
 .. image:: media/mexico02.png
    :align: center
 
+.. _mx-legal-info:
+
 3. Set you legal information in the company
 -------------------------------------------
 

accounting/others/adviser/budget.rst

@@ -5,9 +5,12 @@ How to manage a financial budget?
 Overview
 ========
 
-Managing budgets is an essential part of running a business. It allows
-you to measure your actual financial performance against the planned
-one. Odoo manages its budgets using both General and Analytic Accounts.
+Managing budgets is an essential part of running a business. Budgets help
+people become more intentional with the way money is spent and direct people
+to organize and prioritize their work to meet financial goals. They allows 
+you to plan your desired financial outcome and then measure your actual 
+performance against the plan. Odoo manages budgets using both General and Analytic 
+Accounts.
 
 We will use the following example to illustrate. We just started a
 project with Smith&Co and we would like to budget the incomes and
@@ -34,10 +37,23 @@ management** feature
 Budgetary Positions
 -------------------
 
-Budgetary positions are the general accounts for which you want to keep
+Budgetary positions are lists of accounts for which you want to keep
 budgets (typically expense or income accounts). They need to be defined
 so Odoo can know it which accounts he needs to go get the budget
-information. Some might be already installed with your chart of
+information. 
+
+The budgetary positions act as a type of restriction on what can be recorded
+in the 'practical amount' column in a budget.
+
+Each budgetary position can have any number of accounts from the general 
+ledger (the main chart of accounts) assigned to it, though it must have at least one.  
+
+If you record a transaction that has an analytic account assigned to it that *is* 
+included in a budget line but one of the general ledger accounts *is not* included 
+in the budgetary position for that same budget line, it will not appear within the 
+'practical amount' column of that budget line.
+
+Some budgetary positions might be already installed with your chart of
 accounts.
 
 To define the positions enter the :menuselection:`Accounting module --> Configuration -->

accounting/others/reporting/customize.rst

@@ -5,9 +5,10 @@ How to create a customized reports with your own formulas?
 Overview
 ========
 
-Odoo 9 comes with a powerful and easy-to-use reporting framework.
-Creating new reports (such as a tax report or a balance sheet for a
-specific country) to suit your needs is now easier than ever.
+Odoo 13 comes with a powerful and easy-to-use reporting framework.
+Creating new reports (such as a tax report or a balance sheet or
+income statement with specific groupings and layout ) to suit your
+needs is now easier than ever.
 
 Activate the developer mode
 ===========================
@@ -33,21 +34,21 @@ First, you need to create your financial report. To do that, go to
 .. image:: media/customize02.png
    :align: center
 
-Once the name is filled, there are two other parameters that need to be
+Once the name is entered, there are two other parameters that need to be
 configured:
 
 -  **Show Credit and Debit Columns**
 
 -  **Analysis Period** :
 
-   -  Based on date ranges (eg Profit and Loss)
+   -  Based on date ranges (e.g. Profit and Loss)
 
-   -  Based on a single date (eg Balance Sheet)
+   -  Based on a single date (e.g. Balance Sheet)
 
    -  Based on date ranges with 'older' and 'total' columns and last 3
-      months (eg. Aged Partner Balances)
+      months (e.g. Aged Partner Balances)
 
-   -  Bases on date ranges and cash basis method (eg Cash Flow
+   -  Bases on date ranges and cash basis method (e.g. Cash Flow
       Statement)
 
 Add lines in your custom reports
@@ -95,4 +96,4 @@ Other useful fields :
    (always displayed) or ``never`` (never shown).
 
 .. seealso::
-    * :doc:`main_reports`
+    * :doc:`main_reports`

accounting/overview/process_overview/customer_invoice.rst

@@ -70,7 +70,7 @@ The document is composed of three parts:
 Open or Pro-forma invoices
 ==========================
 
-An invoice will usually include the quantity and price the of goods
+An invoice will usually include the quantity and the price of goods
 and/or services, the date, any parties involved, the unique invoice
 number, and any tax information.
 
@@ -222,7 +222,7 @@ Revenues and Expenses."
 Balance sheet
 =============
 
-The balance sheet summarizes the your company's liabilities,
+The balance sheet summarizes your company's liabilities,
 assets and equity at a specific moment in time.
 
 .. image:: ./media/invoice15.png

accounting/payables/supplier_bills/manage.rst

@@ -34,7 +34,7 @@ Installing the Purchase and Inventory applications
 --------------------------------------------------
 
 From the **Apps** application, search for the **Purchase** module and
-install it. Due to certain dependencies, Installing Purchase will
+install it. Due to certain dependencies, installing Purchase will
 automatically install the **Inventory** and **Accounting** applications.
 
 Creating products
@@ -42,13 +42,13 @@ Creating products
 
 Creating products in Odoo is essential for quick and efficient
 purchasing within Odoo. Simply navigate to the Products submenu under
-Purchase, and click create.
+Purchase and click create.
 
 .. image:: ./media/manage01.png
   :align: center
 
-When creating the product, Pay attention to the **Product Type** field,
-as it is important:
+When creating the product, pay attention to the **Product Type** field,
+since it is important:
 
 - Products that are set as **Stockable or Consumable** will allow you
   to keep track of their inventory levels. These options imply
@@ -64,7 +64,7 @@ as it is important:
 
 	It is recommended that you create a **Miscellaneous** product for all purchases
 	that occur infrequently and do not require inventory valuation or management.
-	If you create such a product, it is recommend to set the product type to **Service**.
+	If you create such a product, it is recommended to set the product type to **Service**.
 
 Managing your Vendor Bills
 ==========================
@@ -90,14 +90,14 @@ Receiving Products
 
 If you purchased any stockable products that you manage the inventory
 of, you will need to receive the products from the Inventory application
-after you confirm a Purchase Order. From the **Inventory dashboard**, you
+after you confirm a purchase order. From the **Inventory dashboard**, you
 should see a button linking you directly to the transfer of products.
 This button is outlined in red below:
 
 .. image:: ./media/manage03.png
   :align: center
 
-Navigating this route will take you to a list of all orders awaiting to
+Navigating this route will take you to a list of all orders waiting to
 be received.
 
 .. image:: ./media/manage04.png
@@ -105,8 +105,8 @@ be received.
 
 If you have a lot of awaiting orders, apply a filter using the search
 bar in the upper right. With this search bar, you may filter based on
-the Vendor (Partner), the product, or the source document, also known as
-the reference of your purchase order. You also have the capability to
+the vendor (partner), the product, or the source document (also known as
+the reference of your purchase order). You can also
 group the orders by different criteria under **Group By**. Selecting an
 item from this list will open the following screen where you then will
 receive the products.
@@ -119,7 +119,7 @@ Purchasing service products does not trigger a delivery order.
 Managing Vendor Bills
 ---------------------
 
-When you receive a Vendor Bill for a previous purchase, be sure to
+When you receive a vendor bill for a previous purchase, be sure to
 record it in the Purchases application under the **Control Menu**. You
 need to create a new vendor bill even if you already registered a
 purchase order.
@@ -127,21 +127,21 @@ purchase order.
 .. image:: ./media/manage06.png
   :align: center
 
-The first thing you will need to do upon creating a Vendor Bill is to
-select the appropriate Vendor as this will also pull up any associated
+The first thing you will need to do upon creating a vendor bill is to
+select the appropriate vendor, since doing so will also pull up any associated
 accounting or pricelist information. From there, you can choose to
-specify any one or multiple Purchase Orders to populate the Vendor Bill
+specify one or multiple Purchase Orders to populate the Vendor Bill
 with. When you select a Purchase Order from the list, Odoo will pull any
 uninvoiced products associated to that Purchase Order and automatically
 populate that information below. If you are having a hard time finding
-the appropriate Vendor bill, you may search through the list by
+the appropriate vendor bill, you may search through the list by
 inputting the vendor reference number or your internal purchase order
 number.
 
 .. image:: ./media/manage07.png
   :align: center
 
-While the invoice is in draft state, you can make any modifications you
+While the invoice is in a draft state, you can make any modifications you
 need (i.e. remove or add product lines, modify quantities, and change
 prices).
 
@@ -166,18 +166,18 @@ Vendor Bill Matching
 What to do if your vendor bill does not match what you received
 ---------------------------------------------------------------
 
-If the bill you receive from the vendor has different quantities than
-what Odoo automatically populates as quantities, this could be due to
+If the bill you receive from the vendor has quantities that do not match
+the quantities automatically populated by Odoo, this could be due to
 several reasons:
 
-- the vendor is incorrectly charging you for products and/or services
-  that you have not ordered,
+- The vendor is incorrectly charging you for products and/or services
+  that you have not ordered.
 
-- the vendor is billing you for products that you might not have
+- The vendor is billing you for products that you might not have
   received yet, as the invoicing control may be based on ordered or
-  received quantities,
+  received quantities.
 
-- or the vendor did not bill you for previously purchased products.
+- The vendor did not bill you for previously purchased products.
 
 In these instances it is recommended that you verify that the bill, and
 any associated purchase order to the vendor, are accurate and that you
@@ -186,13 +186,13 @@ understand what you have ordered and what you have already received.
 If you are unable to find a purchase order related to a vendor bill,
 this could be due to one of a few reasons:
 
-- the vendor has already invoiced you for this purchase order,
-  therefore it is not going to appear anywhere in the selection,
+- The vendor has already invoiced you for this purchase order;
+  therefore it is not going to appear anywhere in the selection.
 
-- someone in the company forgot to record a purchase order for this
-  vendor,
+- Someone in the company forgot to record a purchase order for this
+  vendor.
 
-- or the vendor is charging you for something you did not order.
+- The vendor is charging you for something you did not order.
 
 
 
@@ -223,7 +223,7 @@ Batch Billing
 -------------
 
 When creating a vendor bill and selecting the appropriate purchase
-order, you may continue to select additional purchase orders and Odoo
-will add the additional line items from that purchase order.. If you
-have not deleted the previous line items from the first purchase order
+order, you may continue to select additional purchase orders. Odoo
+will add the additional line items from the purchase orders you select. If you
+have not deleted the previous line items from the first purchase order,
 the bill will be linked to all the appropriate purchase orders.

crm/acquire_leads/generate_from_website.rst

@@ -13,7 +13,7 @@ You should first go to your website app.
 
 |image0|\ |image1|
 
-With the CRM app installed, you benefit from ready-to-use contact form
+With the CRM app installed, you benefit from a ready-to-use contact form
 on your Odoo website that will generate leads/opportunities
 automatically.
 
@@ -32,15 +32,15 @@ Create a custom contact form
 ============================
 
 You may want to know more from your visitor when they use the contact form to
-contact you. You will then need to build a custom contact form on your
-website. Those contact forms can generate multiple types of records in
+you will need to build a custom contact form on your
+website. These contact forms can generate multiple types of records in
 the system (emails, leads/opportunities, project tasks, helpdesk
-tickets, etc...)
+tickets, etc.)
 
 Configuration
 =============
 
-You will need to install the free *Form Builder* module. Only
+You will need to install the free *Form Builder* module, only
 available in Odoo Enterprise.
 
 .. image:: media/generate_from_website05.png
@@ -49,25 +49,25 @@ available in Odoo Enterprise.
 Create a custom contact form
 ----------------------------
 
-From any page you want your contact form to be in, in edit mode, drag
-the form builder in the page and you will be able to add all the fields
+First, go to the page where you want to put your contact form. In edit mode, drag
+the form builder onto the page, and you will be able to add all the fields
 you wish.
 
 .. image:: media/generate_from_website06.png
    :align: center
 
-By default any new contact form will send an email, you can switch to
+By default, any new contact form will send an email. You can switch to
 lead/opportunity generation in *Change Form Parameters*.
 
 .. note::
    If the same visitor uses the contact form twice, the second
-   information will be added to the first lead/opportunity in the chatter.
+   entry will be added to the first lead/opportunity in the chatter.
 
 Generate leads instead of opportunities
 =======================================
 
-When using a contact form, it is advised to use a qualification step
-before assigning to the right sales people. To do so, activate *Leads*
+When using a contact form, you should use a qualification step
+before assigning the form to the right sales people. To do so, activate *Leads*
 in CRM settings and refer to :doc:`convert`.
 
 .. |image0| image:: ./media/generate_from_website01.png

db_management/db_premise.rst

@@ -2,9 +2,9 @@
 
 .. _db_premise:
 
-==============================
-On-premise Database management
-==============================
+===============================
+On-premises Database management
+===============================
 
 Register a database
 ===================
@@ -116,7 +116,7 @@ or
 
 * **Deactivate users** as explained in this `Documentation 
   <https://www.odoo.com
-  /documentation/user/11.0/db_management/documentation.html#deactivating-users>`__
+  /documentation/user/13.0/db_management/documentation.html#deactivating-users>`__
   and **Reject** the upsell quotation.
 
 Once your database has the correct number of users, the expiration message
@@ -154,6 +154,8 @@ None of those solutions worked for you? Please contact our
 
 .. _force_ping:
 
+.. _duplicate_premise:
+
 Duplicate a database
 ====================
 

ecommerce/shopper_experience/paypal.rst

@@ -97,6 +97,9 @@ Click *More Options* and set the two default encoding formats as
 
 Your Paypal account is ready!
 
+  .. tip:: For Encrypted Website Payments & EWP_SETTINGS error,
+     please check the `paypal documentation. <https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/encryptedwebpayments/#encrypted-website-payments-ewp>`__
+
 Settings in Odoo
 ================
 
@@ -167,15 +170,9 @@ Log in to `Paypal Developer Site <https://developer.paypal.com/>`__ with your Pa
 
 This will create two sandbox accounts:
 
--  A business account 
-        (to use as merchant, e.g.
-       `pp.merch01-facilitator@example.com <mailto:pp.merch01-facilitator@example.com>`__).
+-  A business account (to use as merchant, e.g. `pp.merch01-facilitator@example.com <mailto:pp.merch01-facilitator@example.com>`__).
 
-       Log in to `Paypal Developer Site <https://developer.paypal.com/>`__ with your Paypal credentials.
-
--  A default personal account 
-        (to use as shopper, e.g.
-       `pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`__).
+-  A default personal account (to use as shopper, e.g. `pp.merch01-buyer@example.com <mailto:pp.merch01-buyer@example.com>`__).
 
 Log in to Paypal Sandbox with the merchant account and follow the same configuration instructions.
 Enter your sandbox credentials in Odoo and make sure Paypal is still

general/auth.rst

@@ -6,4 +6,6 @@ Authentication
    :titlesonly:
 
    auth/google
-   auth/azure
+   auth/azure
+   auth/ldap
+

general/auth/ldap.rst

@@ -0,0 +1,44 @@
+=======================================
+How to allow users to sign in with LDAP
+=======================================
+
+- Install the LDAP module in General Settings.
+
+- Click on **Create** in Setup your LDAP Server.
+
+.. image:: media/ldap01.png
+    :align: center
+
+.. image:: media/ldap02.png
+    :align: center
+
+- Choose the company about to use the LDAP.
+
+.. image:: media/ldap03.png
+    :align: center
+
+- In **Server Information**, enter the IP address of your server and the port it listens to.
+
+- Tick **User TLS** if your server is compatible.
+
+.. image:: media/ldap04.png
+    :align: center
+
+- In **Login Information**, enter ID and password of the account used to query the server. If left empty, the server will be queried anonymously.
+
+.. image:: media/ldap05.png
+    :align: center
+
+- In **Process Parameter**, enter the domain name of your LDAP server in LDAP nomenclature (e.g. ``dc=example,dc=com``).
+
+- In **LDAP filter**, enter ``uid=%s``
+
+.. image:: media/ldap06.png
+    :align: center
+
+- In **User Information**, tick *Create User* if you want Odoo to create a User profile the first time someone log in with LDAP.
+
+- In **Template User**, indicate a template for the new profiles created. If left blanked, the admin profile will be used as template.
+
+.. image:: media/ldap07.png
+    :align: center

general/base_import/import_faq.rst

@@ -78,7 +78,7 @@ you will then be able to choose from the complete list of fields for each column
 Where can I change the date import format?
 ------------------------------------------
 
-Odoo can automatically detect if a column is a date and it will try to guess the date format from a set of most used date format. While this process can work for a lot of simple date format, some exotic date format will not be recognize and it is also possible to have some confusion (day and month inverted as example) as it is difficult to guess correctly which part is the day and which one is the month in a date like '01-03-2016'.
+Odoo can automatically detect if a column is a date, and it will try to guess the date format from a set of most commonly used date formats. While this process can work for many date formats, some date formats will not be recognized. This can cause confusion due to day-month inversions; it is difficult to guess which part of a date format is the day and which part is the month in a date such as '01-03-2016'.
 
 To view which date format Odoo has found from your file you can check the **Date Format** that is shown when clicking on **Options** under the file selector. If this format is incorrect you can change it to your liking using the *ISO 8601* to define the format.
 
@@ -247,4 +247,4 @@ It will produce the following CSV file::
 
 As you can see in this file, Fabien and Laurence are working for the Bigees company (company_1) and Eric is working for the Organi company. The relation between persons and companies is done using the External ID of the companies. We had to prefix the "External ID" by the name of the table to avoid a conflict of ID between persons and companies (person_1 and company_1 who shared the same ID 1 in the orignial database).
 
-The two files produced are ready to be imported in Odoo without any modifications. After having imported these two CSV files, you will have 4 contacts and 3 companies. (the firsts two contacts are linked to the first company). You must first import the companies and then the persons.
+The two files produced are ready to be imported in Odoo without any modifications. After having imported these two CSV files, you will have 4 contacts and 3 companies. (the firsts two contacts are linked to the first company). You must first import the companies and then the persons.

general/unsplash/unsplash_access_key.rst

@@ -3,7 +3,7 @@ How to generate an Unsplash access key
 =======================================================
 
 .. tip::
-  **As a SaaS user**, Unsplash is ready to use. You won't need to follow this guide to set up Unsplash informations as you will use our own Odoo Unsplash key in a transparent way.
+  **As an SaaS user**, you are ready to use Unsplash. You won't need to follow this guide to set up Unsplash informations, since you will use our own Odoo Unsplash key in a transparent way.
 
 Generate an Unsplash access key for **non-Saas** users
 ======================================================
@@ -20,7 +20,7 @@ Generate an Unsplash access key for **non-Saas** users
 .. image:: media/accept_terms.png
     :align: center
 
-- You will be prompted to insert an **Application name** and a **Description**. Please prefix your application name by "**Odoo:** " so it can be recognized as an Odoo instance by Unsplash. Once done, click on **Create application**.
+- You will be prompted to insert an **Application name** and a **Description**. Please prefix your application name by "**Odoo:** " so that Unsplash can recognize it as an Odoo instance. Once done, click on **Create application**.
 
 .. image:: media/app_infos.png
     :align: center
@@ -31,7 +31,7 @@ Generate an Unsplash access key for **non-Saas** users
     :align: center
 
 .. warning::
-  **As a non-SaaS user**, you won't be able to register for a production Unsplash key and will be limited to your test key that has a 50 Unsplash requests per hour restriction.
+  **As a non-SaaS user**, you won't be able to register for a production Unsplash key and will be limited to your test key that has a restriction of 50 Unsplash requests per hour.
 
 .. seealso::
     * :doc:`unsplash_application_id`

getting_started/documentation.rst

@@ -115,7 +115,7 @@ into account from the beginning of the project:
    gap to be filled by developments/customizations or changes in
    business processes.
 
--  `The User Story <https://help.rallydev.com/writing-great-user-story>`__:
+-  **The User Story**:
    This technique clearly separates the responsibilities between the
    SPoC, responsible for explaining the WHAT, the WHY and the WHO,
    and the Consultant who will provide a response to the HOW.
@@ -252,42 +252,7 @@ as possible, it will be decided :
 8. Support
 ==========
 
-Your Odoo Online subscription includes **unlimited 24hr support at no extra
-cost, Monday to Friday**. Our teams are located around the world to ensure you
-have support, no matter your location. Your support representative could be
-communicating to you from San Francisco, Belgium, or India!
+When your project is put in production, our support teams take care of your
+questions or technical issues.
 
-What kind of support is included?
-
-- Providing you with relevant material (guidelines, product documentation,
-  etc...)
-- Answers to issues that you may encounter in your standard Odoo database (eg.
-  “I cannot close my Point of Sale” or “I cannot find my sales KPIs?”)
-- Questions related to your account, subscription, or billing
-- Bug resolution (blocking issues or unexpected behaviour not due to
-  misconfiguration or customization)
-- Issues that might occur in a test database after upgrading to a newer version
-
-*Odoo Support does not make changes to your production database, but gives you
-the material and knowledge to do it yourself!*
-
-What kind of support is not included?
-
-- Questions that require us to understand your business processes in order to
-  help you implement your database
-- Training on how to use our software (we will direct you to our many resources)
-- Import of documents into your database
-- Guidance on which configurations to apply inside of an application or the database
-- How to set up configuration models (Examples include: Inventory Routes,
-  Payment Terms, Warehouses, etc)
-- Questions or issues related to specific developments or customizations done
-  either by Odoo or a third party (this is specific only to your database or
-  involving code)
-
-You can get this type of support with a `Success Pack <https://www.odoo.com/pricing-packs>`__.
-With a pack, one of our consultants will analyze the way your business runs and
-tell you how you can get the most out of your Odoo Database. We will handle all
-configurations and coach you on how to use Odoo.
-
-Our support team can be contacted through our
-`online support form <https://www.odoo.com/help>`__.
+See :ref:`support-expectations`.

helpdesk/getting_started.rst

@@ -85,7 +85,7 @@ Ticket.
 
 The final option to submit tickets is thru an API connection. View the
 documentation
-`*here* <https://www.odoo.com/documentation/11.0/webservices/odoo.html>`__.
+`*here* <https://www.odoo.com/documentation/13.0/webservices/odoo.html>`__.
 
 Tickets have been created, now what?
 ------------------------------------

inventory/barcode/setup/hardware.rst

@@ -26,13 +26,13 @@ scanner** and the **mobile computer scanner**.
     is a good choice if you want to be mobile but don't need a big
     investment. An approach is to log in Odoo on you smartphone, pair
     the bluetooth scanner with the smartphone and work in the
-    warehouse with always the possibility to check your smartphone
+    warehouse with the possibility to check your smartphone
     from time to time and use the software 'manually'.
 
 -   For heavy use, the **mobile computer scanner** is the handiest solution.
-    It consists in a small computer with a built-in barcode scanner.
+    It consists of a small computer with a built-in barcode scanner.
     This one can turn out to be a very productive solution, however
-    you need to make sure that is is capable of running Odoo smoothy.
+    you need to make sure that is is capable of running Odoo smoothly.
     The most recent models using Android + Google Chrome or Windows +
     Internet Explorer Mobile should do the job. However, due to the
     variety of models and configurations on the market, it is

inventory/barcode/setup/software.rst

@@ -8,17 +8,6 @@ attributing barcodes to products, pickings locations, etc. allows you to
 work more efficiently by controlling the software almost exclusively
 with the barcode scanner.
 
-.. |download_barcode| image:: ../../../_static/banners/pdf-icon.png
-      :alt: Download Barcode Document
-      :target: ../../../_static/files/barcodes_actions.pdf
-
-
-.. note::
-    Print this document to be able to use your barcode scanner to perform more actions.
-    
-    Document: |download_barcode|
-
-
 Set products barcodes
 =====================
 

inventory/management/delivery/scheduled_dates.rst

@@ -81,7 +81,7 @@ numbers of security days from the calculation and thus to compute a
 scheduled date earlier than the one you promised to your client. In that
 way you are sure to be able to keep your commitment.
 
-To set ut your security dates, go to :menuselection:`Settings --> General settings` and
+To set up your security dates, go to :menuselection:`Settings --> General settings` and
 click on **Configure your company data**.
 
 .. image:: media/scheduled_dates04.png

inventory/management/lots_serial_numbers/serial_numbers.rst

@@ -66,7 +66,7 @@ numbers.
    :align: center
 
 If you move products that already have serial numbers assigned, those
-will appear in the list. Just click on the **+** icon to to confirm that you
+will appear in the list. Just click on the **+** icon to confirm that you
 are moving those serial numbers.
 
 .. image:: media/serial_numbers05.png
@@ -126,4 +126,4 @@ You can have more details by clicking on the **Traceability** button :
 
 .. seealso::
     * :doc:`differences`
-    * :doc:`lots`
+    * :doc:`lots`

inventory/routes/concepts/procurement_rule.rst

@@ -43,14 +43,14 @@ In the Procurement rules section, click on Add an item.
     :align: center
 
 Here you can set the conditions of your rule. There are 3 types of
-action possibles :
+action possible :
 
 -   Move from another location rules
 
 -   Manufacturing rules that will trigger the creation of manufacturing
-    orders.
+    orders
 
--   Buy rules that will trigger the creation of purchase orders.
+-   Buy rules that will trigger the creation of purchase orders
 
 .. note:: 
     The Manufacturing application has to be installed in order to
@@ -74,4 +74,4 @@ action possibles :
 .. seealso::
     * :doc:`push_rule`
     * :doc:`inter_warehouse`
-    * :doc:`cross_dock`
+    * :doc:`cross_dock`

inventory/routes/concepts/push_rule.rst

@@ -13,7 +13,7 @@ meet the forecast demand and sell, or push, the goods to the consumer.
 Disadvantages of the push inventory control system are that forecasts
 are often inaccurate as sales can be unpredictable and vary from one
 year to the next. Another problem with push inventory control systems is
-that if too much product is left in inventory. This increases the
+that if too much product is left in inventory, this increases the
 company's costs for storing these goods. An advantage to the push system
 is that the company is fairly assured it will have enough product on
 hand to complete customer orders, preventing the inability to meet
@@ -82,4 +82,4 @@ be moved to the main stock.
 .. seealso::
     * :doc:`procurement_rule`
     * :doc:`inter_warehouse`
-    * :doc:`cross_dock`
+    * :doc:`cross_dock`

inventory/routes/costing/landed_costs.rst

@@ -11,7 +11,7 @@ insurance, customs duties, etc.) into the cost of the product.
 .. note::
     Landed costs can only be applied to products with a FIFO costing method and
     an automated inventory valuation (which requires the accounting application
-    to be instealled).
+    to be installed).
 
 Configuration
 =============

inventory/routes/strategies/removal.rst

@@ -124,7 +124,7 @@ These dates can be set from :menuselection:`Inventory Control --> Serial Numbers
 
 -   **Removal Date:** This is the date on which the goods with this
     serial/lot number should be removed from the stock. Using the FEFO
-    removal strategym goods are picked for delivery orders using this date.
+    removal strategy goods are picked for delivery orders using this date.
 
 -   **Alert Date:** This is the date on which an alert should be sent
     about the goods with this serial/lot number.

inventory/settings/products/uom.rst

@@ -7,7 +7,7 @@ Overview
 
 In some cases, handling products in different unit of measures is
 necessary. For example, if you buy products in a country where the
-metric system is of application and sell the in a country where the
+metric system is of application and sell them in a country where the
 imperial system is used, you will need to convert the units.
 
 You can set up Odoo to work with different units of measure for one
@@ -26,7 +26,7 @@ different units of measure (advanced)**, then click on **Apply**.
 Setting up units on your products
 =================================
 
-In :menuselection:`Inventory Control --> Products`, open the product which you would like to
+In :menuselection:`Master Data --> Products`, open the product which you would like to
 change the purchase/sale unit of measure, and click on **Edit**.
 
 In the **Unit of Measure** section, select the unit in which the product
@@ -126,4 +126,4 @@ converted automatically :
     -  When should you use packages, units of measure or kits?
 
 
-.. |edit| image:: ./media/uom07.png
+.. |edit| image:: ./media/uom07.png

inventory/shipping/operation/invoicing.rst

@@ -61,8 +61,8 @@ On your sale order, choose the carrier that will be used. Click on
 The price is computed when you **save** the sale order. Confirm the sale
 order and proceed to deliver the product.
 
-The real shipping cost are computed when the delivery order is
-validated.
+The real shipping cost is computed when the delivery order is
+validated, you can see the real cost in the chatter of the delivery order.
 
 .. image:: media/invoicing02.png
    :align: center

legal/others/cla.rst

@@ -9,5 +9,5 @@ have to sign the Odoo Contributor License Agreement (CLA).
 
 More information about this requirement, the procedure to sign the agreement,
 and a FAQ can be found on our
-`GitHub project page <https://github.com/odoo/odoo/blob/11.0/doc/cla/sign-cla.md>`_.
+`GitHub project page <https://github.com/odoo/odoo/blob/13.0/doc/cla/sign-cla.md>`_.
 

livechat/livechat.rst

@@ -4,8 +4,8 @@
 Live Chat
 =========
 
-Chat in live with website visitors
-==================================
+Chat in real time with website visitors
+=======================================
 
 With Odoo Live Chat, you can establish a direct contact with your
 website visitors. A simple dialog box will be available on their screen
@@ -89,12 +89,12 @@ has joined the channel.
    unpublished on the website, then the live chat button will not appear to
    visitors.
 
-In practice, the conversations initiated by the visitors will appear in
-the Discuss module and will also pop up as a direct message. Therefore,
+Conversations initiated by visitors also appear in
+the Discuss module in addition to popping up as a direct message. Therefore,
 inquiries can be answered wherever you are in Odoo.
 
-If there several operators in charge of a channel, the system will
-dispatch sessions randomly between them.
+If there are several operators who have all joined a channel, the system will
+dispatch visitor sessions randomly between them.
 
 Use commands
 ============

manufacturing/management.rst

@@ -12,6 +12,10 @@ Manufacturing Management
    management/kit_shipping
    management/product_variants
    management/sub_assemblies
+   management/flexible_components_consumption
+   management/plan_work_orders
+   management/alternative_wc
    management/unbuild
    management/subcontracting
    management/routing_kit_bom
+   management/use_mps

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