[MERGE] Forward-port of branch 14.0 to master

conf.py

@@ -131,7 +131,7 @@ github_project = 'documentation'
 
 locale_dirs = ['../locale/']
 
-# custom docname_to_domain to devide the translations of applications in subdirectories
+# custom docname_to_domain to divide the translations of applications in subdirectories
 sphinx.transforms.i18n.docname_to_domain = (
     sphinx.util.i18n.docname_to_domain
 ) = lambda docname, compact: docname.split('/')[1 if docname.startswith('applications/') else 0]

content/administration/db_management/db_online.rst

@@ -14,7 +14,7 @@ button.
     :align: center
 
 Make sure you are connected as the administrator of the database you
-want to manage - many operations depends on indentifying you remotely to that
+want to manage - many operations depends on identifying you remotely to that
 database.
 
 Several actions are available:
@@ -113,7 +113,7 @@ receive an e-mail with the URL of the test database.
 
 **Testing your database is the most important step of the upgrade process!**
 Even though we test all upgrades manually, we do not know your work processes.
-A change in standard worfklows of Odoo in new versions might require you to
+A change in standard workflows of Odoo in new versions might require you to
 change internal processes, or some of the customizations you made through Odoo
 Studio might not work properly. *It is up to you to make sure that everything
 works as it should!* You can report issues with your test database through our

content/applications/finance/accounting/fiscal_localizations/localizations/chile.rst

@@ -346,7 +346,7 @@ for this document type, the invoice number takes the first folio in the sequence
 
 .. important::
    In case you have used some folios in your previous system, make sure you set the next valid
-   folio when the first transation is created. 
+   folio when the first transaction is created. 
 
 
 

content/applications/finance/accounting/fiscal_localizations/localizations/mexico.rst

@@ -1358,7 +1358,7 @@ generic one with no explanation.
       '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does
       not resolve to a(n) simple type definition., line 36``
 
-   This can be caused by a database backup restored in anothe server,
+   This can be caused by a database backup restored in another server,
    or when the XSD files are not correctly downloaded. Follow the same steps
    as above but:
 

content/applications/finance/accounting/fiscal_localizations/localizations/peru.rst

@@ -74,8 +74,8 @@ The chart of accounts for Peru is based on the most updated version of the :abbr
 Contable General Empresarial)`, which is grouped in several categories and is compatible with NIIF
 accounting.
 
-Accouting Seetings
+Accounting Settings
-------------------
+-------------------
 
 Once the modules are installed and the basic information of your company is set, you need to 
 configure the elements required for Electronic Invoice. For this, go to :menuselection:`Accounting 
@@ -476,8 +476,8 @@ The price list in the IAP is always displayed in EUR.
 Special Use cases
 ~~~~~~~~~~~~~~~~~
 
-Cancelation process
+Cancellation process
-*******************
+********************
 
 Some scenarios require an invoice cancellation, for example, when an invoice was created by mistake. 
 If the invoice was already sent and validated by the SUNAT, the correct way to proceed is by 
@@ -512,8 +512,8 @@ chatter indicating the correct Government validation.
 .. warning::
    One credit is consumed on each cancellation request.
    
-Cancelation process
+Cancellation process
-*******************
+********************
 
 When creating exportation invoices, take into account the next considerations:
 

content/applications/finance/accounting/getting_started/initial_configuration/setup.rst

@@ -147,7 +147,7 @@ This form is the same as :ref:`the one presented in the Accounting onboarding ba
 Invoice Layout
 --------------
 
-With this tool, you can design the appearance of your documents by selecting which layout tamplate,
+With this tool, you can design the appearance of your documents by selecting which layout template,
 paper format, colors, font, and logo you want to use.
 
 You can also add your *Company Tagline* and the content of the documents’ *footer*. Note that Odoo

content/applications/finance/accounting/others/analytic/usage.rst

@@ -183,8 +183,8 @@ automatic recharging of the services to the customer at the end of the
 month. To invoice customers, just link the analytic account to a sale
 order and sell products that manage timesheet or expenses .
 
-Case 3: IT Services Company: perfomance analysis
+Case 3: IT Services Company: performance analysis
-------------------------------------------------
+-------------------------------------------------
 
 Most IT service companies face the following problems:
 

content/applications/finance/accounting/payables/pay/sepa.rst

@@ -119,7 +119,7 @@ The bank refuses my SEPA file
 
 Ask your bank if they support the **SEPA Credit Transfer specification**
 (the SEPA pain version depends on the country set on your company). If
-they don't, or cannot provide relevant informations, please forward the
+they don't, or cannot provide relevant information, please forward the
 error message to your Odoo partner.
 
 There is no Bank Identifier Code recorded for bank account ...

content/applications/finance/accounting/receivables/customer_invoices/snailmail.rst

@@ -15,7 +15,7 @@ Set up Snailmail
 
 .. image:: media/setup_snailmail.png
    :align: center
-   :alt: Under settings enable the snailmail feauture in Odoo Accounting
+   :alt: Under settings enable the snailmail feature in Odoo Accounting
 
 Send your invoices by post
 --------------------------

content/applications/finance/accounting/receivables/customer_payments/check.rst

@@ -40,7 +40,7 @@ Configuration
 
 -  Create a journal **Checks**
 
--  Set **Undeposited Checks** as a defaut credit/debit account
+-  Set **Undeposited Checks** as a default credit/debit account
 
 -  Set the bank account related to this journal as **Allow Reconciliation**
 

content/applications/finance/accounting/taxation/taxes/taxcloud.rst

@@ -51,7 +51,7 @@ Salestax is calculated in Odoo based on fiscal positions
 A Fiscal Position for the United States is created when installing *TaxCloud*.
 Everything works out-of-the-box.
 
-You can configure Odoo to automtically detect which Customers should use this fiscal
+You can configure Odoo to automatically detect which Customers should use this fiscal
 position.  Go to :menuselection:`Accounting --> Configuration --> Fiscal Positions`
 to open and edit the record.
 

content/applications/general/base_import/import_faq.rst

@@ -228,7 +228,7 @@ Can I import several times the same record?
 -------------------------------------------
 
 If you import a file that contains one of the column "External ID" or "Database ID", records that
-have already been imported will be modified instead of being created. This is very usefull as it
+have already been imported will be modified instead of being created. This is very useful as it
 allows you to import several times the same CSV file while having made some changes in between two
 imports. Odoo will take care of creating or modifying each record depending if it's new or not.
 

content/applications/general/unsplash/unsplash_access_key.rst

@@ -3,7 +3,7 @@ How to generate an Unsplash access key
 =======================================================
 
 .. tip::
-  **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.
+  **As an SaaS user**, you are ready to use Unsplash. You won't need to follow this guide to set up Unsplash information, since you will use our own Odoo Unsplash key in a transparent way.
 
 Generate an Unsplash access key for **non-Saas** users
 ======================================================

content/applications/inventory_and_mrp/inventory/management/reporting/inventory_valuation_config.rst

@@ -266,7 +266,7 @@ Profit&Loss section to your assets.
   ===================================== ===== ======
 
   If the stock value decreased, the **Inventory** account is credited
-  and te **Inventory Variations** debited.
+  and the **Inventory Variations** debited.
    
 .. raw:: html
 

content/applications/inventory_and_mrp/inventory/routes/concepts/use-routes.rst

@@ -69,7 +69,7 @@ are triggered until a transfer between the *Stock* and the *Picking
 Area* is created.
 
 .. note::
-   All theses transfers are pre-generated by Odoo, starting from the end and going backwards.
+   All these transfers are pre-generated by Odoo, starting from the end and going backwards.
    While working, the operator process these transfers in the opposite order: first the picking, 
    then the packing, then the delivery order.
 

content/applications/inventory_and_mrp/inventory/shipping/setup/ups_credentials.rst

@@ -10,7 +10,7 @@ In order to use the Odoo UPS API, you will need:
 
 - An Access Key
 
-An Access Key is a 16 character alpha-numeric code that allows access to
+An Access Key is a 16 character alphanumeric code that allows access to
 the UPS Developer Kit API Development and Production servers.
 
 Create a UPS Account

content/applications/sales/crm/acquire_leads/lead_mining.rst

@@ -17,7 +17,7 @@ Start generating leads
 ==========================
 You will now have a new button **Generate Leads** available in your pipeline.
 You are also able to create lead mining requests from the
-:menuselection:`Configuration --> Lead Mining Requests` and trough
+:menuselection:`Configuration --> Lead Mining Requests` and through
 :menuselection:`Leads --> Leads` where you have the **Generate Leads** button.
 
 .. image:: media/LM2.png

content/applications/sales/crm/track_leads/lead_scoring.rst

@@ -3,7 +3,7 @@ Assign leads based on scoring
 =============================
 
 With *Leads Scoring* you can automatically rank your leads based on
-selected criterias.
+selected criteria.
 
 For example you could score customers from your country higher or the
 ones that visited specific pages on your website.
@@ -24,7 +24,7 @@ You now have a new tab in your *CRM* app called *Leads Management*
 where you can manage your scoring rules.
 
 Here's an example for a Canadian lead, you can modify for whatever
-criteria you wish to score your leads on. You can add as many criterias
+criteria you wish to score your leads on. You can add as many criteria
 as you wish.
 
 .. image:: media/lead_scoring02.png

content/applications/sales/point_of_sale/payment/ingenico.rst

@@ -24,7 +24,7 @@ Configure the Lane/5000 for Ingenico BENELUX
 Click on the F button of the terminal, then go in the
 :menuselection:`PoS Menu --> Settings` and enter the settings password.
 
-Now, click on connexion change and TCP/IP. Type the IP of your *IoT
+Now, click on connection change and TCP/IP. Type the IP of your *IoT
 Box* (you can find it on the form view of your IoT Box). Then, enter
 9000 as port. The terminal will restart. Once it is done, go on your
 *IoT Box* form in Odoo and verify that the terminal has been found.
@@ -66,12 +66,12 @@ still retry to send the payment request.
 
 If there is any issue with the payment terminal, you can still force the
 payment using the *Force Done*. This will allow you to validate the
-order in Odoo even if the connexion between the terminal and Odoo has
+order in Odoo even if the connection between the terminal and Odoo has
 issues.
 
 .. note::
    This option will only be available if you received an error message
-   telling you the connexion failed.
+   telling you the connection failed.
 
 Once your payment is processed, on the payment record, you’ll find the
 type of card that has been used and the transaction ID.

content/applications/sales/point_of_sale/payment/six.rst

@@ -50,5 +50,5 @@ Successful*. You can always reverse the last transaction by clicking on
 
 If there is any issue with the payment terminal, you can still force the
 payment using the *Force Done*. This will allow you to validate the
-order in Odoo even if the connexion between the terminal and Odoo
+order in Odoo even if the connection between the terminal and Odoo
 encounters issues.

content/applications/sales/sales/ebay_connector/manage.rst

@@ -24,7 +24,7 @@ Listing with variations
 =======================
 
 When the **use eBay** on a product with variations is checked and with **Fixed
-Price** as **Listing Type**, the eBay form is sligthly different. In the
+Price** as **Listing Type**, the eBay form is slightly different. In the
 variants array, you can choose which variant will be listed on eBay as well as
 set the price and the quantity for each variant.
 
@@ -47,4 +47,4 @@ Products identifiers such as EAN, UPC, Brand or MPN are required in most of the
 The module manages the EAN and UPC identifiers with the **Barcode** field of the product variant.
 If the **Barcode** field is empty or is value is not valid, the EAN and UPC values will be set as 'Does not apply' as recommended by eBay.
 The Brand and MPN values are working as item specifics and should be define in the **Variants** tab on the product form.
-If theses values are not set, 'Does not apply' will be used for the eBay listing.
+If these values are not set, 'Does not apply' will be used for the eBay listing.

content/applications/sales/sales/ebay_connector/setup.rst

@@ -42,7 +42,7 @@ Using the updated synchronisation method
 If you have a lot of products, the eBay API can sometimes refuse some synchronization
 calls due to a time-based limit on the number of requests that eBay enforces.
 
-To fix this issue, a new implementation mechanism has been developped; however this
+To fix this issue, a new implementation mechanism has been developed; however this
 updated mechanism is disabled by default to avoid having the 2 systems running in
 parallel in existing installations.
 

content/applications/sales/sales/products_prices/prices/pricing.rst

@@ -69,7 +69,7 @@ Discounts, margins, roundings
 *Advanced pricing based on formula* allows to set price change rules.
 Changes can be relative to the product list/catalog price, the product cost price,
 or to another pricelist. Changes are calculated via discounts or surcharges and can be
-forced to fit within floor (minumum margin) and ceilings (maximum margins). 
+forced to fit within floor (minimum margin) and ceilings (maximum margins).
 Prices can be rounded to the nearest cent/dollar or multiple of either
 (nearest 5 cents, nearest 10 dollars).
 

content/applications/websites/website/optimize/link_tracker.rst

@@ -23,7 +23,7 @@ to get a specific tracked URL based on the campaign, medium, and source being us
 
 .. image:: media/link_tracker_fields.png
    :align: center
-   :alt: View of the link traker fields for Odoo Website
+   :alt: View of the link tracker fields for Odoo Website
 
 - **URL**: url of the page you want to track (e.g. the home page or a product's page).
 - **Campaign**: context of your link (e.g. a special promotion).

content/applications/websites/website/publish/translate.rst

@@ -14,11 +14,7 @@ Process
 Once your website is created, you have the opportunity to translate it
 in as many different languages as you want.
 
-There are two ways to translate your website, you can do it manually or
+You can only translate your website manually, follow the next step.
-automatically with the Gengo App. If you want to do it automatically, go
-to the **App** module and Install **Automated translations through Gengo
-Api** and **Website Gengo Translator**. If you want to do it manually,
-don't install anything, and follow the next step.
 
 Now go to your website. On the bottom right corner of the page, click on
 **Add a language**.
@@ -42,23 +38,3 @@ that some of the text has been translated automatically.
 To translate the content of the website, click on **Translate** (here
 **Traduire** since we want to translate the website in French).
 
-There, if you have installed the Gengo Translator, You will see that
-next to the **Translate** button you also have a button **Translate
-automatically**. Once you click on that button, you will be asked some
-information on your account. If you don't have an account yet, follow
-`this link <https://gengo.com/auth/form/login/>`_
-in order to create one. You need to ask for a public key and a private
-key.
-
-The content you wish to translate will then be translated automatically.
-
-.. image:: media/translate_website04.png
-    :align: center
-
-Now you can see that most of the content is highlighted in yellow or
-in green. The yellow represents the content that you have to translate by
-yourself. The green represents the content that has already been translated
-automatically.
-
-.. image:: media/translate_website05.png
-    :align: center

content/developer/howtos/rdtraining/12_sprinkles.rst

@@ -286,7 +286,7 @@ on the value of other fields thanks to the ``attrs`` attribute. Note that ``invi
 to other elements of the view such as ``button`` or ``group``.
 
 The ``attrs`` is a dictionary with the property as a key and a domain as a value. The domain gives
-the conditon in which the property applies. For example:
+the condition in which the property applies. For example:
 
 .. code-block:: xml
 

content/developer/howtos/rdtraining/16_guidelines_pr.rst

@@ -72,7 +72,7 @@ Create your working branch:
 
     $ git checkout -b master-my_first_branch-xyz
 
-Your branch name must follow the following name strucutre : <targetVersion>-<feature>-<trigram>
+Your branch name must follow the following name structure : <targetVersion>-<feature>-<trigram>
 
 Example: The branch master-sale-fixes-abc on odoo-dev/odoo is a branch containing fixes for the
 sales app in the odoo/odoo repository, to be deployed in master and done by ABC.

content/developer/howtos/rdtraining/B_acl_irrules.rst

@@ -172,12 +172,12 @@ while one with B and C will be able to read or update, but not search or read.
 
 .. note::
 
-    * The group of an access right can be ommitted, this means the ACL applies
+    * The group of an access right can be omitted, this means the ACL applies
       to *every user*, this is a useful but risky fallback as depending on the
       applications installed it can grant even non-users access to the model.
     * If no access right applies to a user, they are not granted access
       (default-deny).
-    * If a menu item points to a model to which a user doesn't have acces and
+    * If a menu item points to a model to which a user doesn't have access and
       has no submenus which the user can see, the menu will not be displayed.
 
 .. exercise:: Update the access rights file to:
@@ -412,7 +412,7 @@ another.
 Odoo can be used to manage multiple companies inside the same system, however
 the actual handling is up to individual modules: Odoo itself provides the tools
 to manage the issue like company-dependent fields and *multi-company rules*,
-which is what we're going to concern outselves with.
+which is what we're going to concern ourselves with.
 
 We want different agencies to be "siloed" from one another, with properties
 belonging to a given agency and users (whether agents or managers) only able to

content/developer/howtos/rdtraining/E_unittest.rst

@@ -76,7 +76,7 @@ Integration Bots
   `github.com/odoo`. We highly recommend having your own CI if it is not the case.
 
 When a test is written, it is important to make sure it always passes when modifications are
-applied to the source code. To automatize this task, we use a development practice called
+applied to the source code. To automate this task, we use a development practice called
 Continuous Integration (CI). This is why we have some bots running all the tests at different
 moments.
 Whether you are working at Odoo or not, if you are trying to merge something inside `odoo/odoo`,

content/developer/howtos/themes.rst

@@ -394,7 +394,7 @@ So here are the steps to create a robust and consistent style for your theme:
 
 \(1) Set the values for Odoo-provided SCSS variables
 
-Odoo declares many CSS rules, most being entirely customizable by overridding
+Odoo declares many CSS rules, most being entirely customizable by overriding
 the related SCSS variables. First, create a new file called primary_variables.scss
 and add it the same way as the style.scss file. The only difference it that
 you won't add it in the ``assets_frontend`` template but in the ``_assets_primary_variables``

content/developer/reference/guidelines.rst

@@ -330,7 +330,7 @@ should have a real naming as it is used as display name.
     </record>
 
     <record id="model_name_action_child_list" model="ir.actions.act_window">
-        <field name="name">Model Access Childs</field>
+        <field name="name">Model Access Children</field>
     </record>
 
     <!-- menus and sub-menus -->

content/developer/reference/javascript_reference.rst

@@ -357,7 +357,7 @@ manifest counterparts.
     directives `replace`, `before` and `after`.
 
 ``active`` (default= `True`)
-    Wether the record is active
+    Whether the record is active
 
 ``sequence`` (default= `16`)
     Loading order of the asset records (ascending). A sequence lower than 16 means

content/developer/reference/mobile.rst

@@ -60,7 +60,7 @@ Check if the method is available and then execute it.
 Methods
 -------
 
-.. note:: Each of the methods returns a JQuery Deffered object which returns
+.. note:: Each of the methods returns a JQuery Deferred object which returns
    a data JSON dictionary
 
 Show Toast in device

content/developer/reference/security.rst

@@ -32,7 +32,7 @@ thus applying security mechanisms to users.
 
         Other groups to set on the user alongside this one. This is a
         convenience pseudo-inheritance relationship: it's possible to
-        explicitely remove implied groups from a user without removing the
+        explicitly remove implied groups from a user without removing the
         implier.
 
     .. attribute:: comment

content/developer/reference/views.rst

@@ -456,7 +456,7 @@ calendar view are:
   * ``write_model`` and ``write_field`` and ``filter_field``
 
     you can add a filter and save the result in the defined model, the
-    filter is added in the sidebar. The ``filter_field`` is optionnal and allows
+    filter is added in the sidebar. The ``filter_field`` is optional and allows
     you to specify the field that will hold the status of the filter.
   * ``filter`` and ``color``
 
@@ -1240,7 +1240,7 @@ view architecture is:
         the measure field of the adjusted cell
       ``change``
         the difference between the old value of the cell and the adjusted one,
-        may be possitive or negative
+        may be positive or negative
 
     * optional ``hide_line_total`` and ``hide_column_total`` attributes
 

extensions/github_link/__init__.py

@@ -110,7 +110,7 @@ def add_doc_link(app, pagename, templatename, context, doctree):
         return
 
     # FIXME: find other way to recover current document's source suffix
-    # in Sphinx 1.3 it's possible to have mutliple source suffixes and that
+    # in Sphinx 1.3 it's possible to have multiple source suffixes and that
     # may be useful in the future
     source_suffix = app.config.source_suffix
     source_suffix = next(iter(source_suffix))

extensions/odoo_theme/static/scss/bootstrap_scss/_tables.scss

@@ -71,7 +71,7 @@
 //
 // When borders are added on all sides of the cells, the corners can render odd when
 // these borders do not have the same color or if they are semi-transparent.
-// Therefor we add top and border bottoms to the `tr`s and left and right borders
+// Therefore we add top and border bottoms to the `tr`s and left and right borders
 // to the `td`s or `th`s
 
 .table-bordered {

static/js/entries.js

@@ -160,7 +160,7 @@
             ],
             configuration: [
                 "Revenue: defined on the product, or the product category if not on the product, field Income Account",
-                "Defered Tax Liabilities: defined on the tax used on the invoice line",
+                "Deferred Tax Liabilities: defined on the tax used on the invoice line",
                 "Accounts Receivable: defined on the customer (property)",
                 "Inventory: defined on the category of the related product (property)",
                 "Expenses: defined on the product, or the category of product (property)",