[MERGE] Forward-port of branch 13.0 to 14.0

2021-05-31 15:16:09 +02:00
parent 2f4c713be1 c9b6795179
commit a1e7024fa0
49 changed files with 95 additions and 95 deletions
@@ -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. 



@@ -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:

@@ -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:

@@ -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
@@ -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:

@@ -117,9 +117,9 @@ Troubleshooting
 The bank refuses my SEPA file
 -----------------------------

-Ask your bank if they support the **SEPA Credit Transfer specification** 
+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 ...
@@ -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
 --------------------------
@@ -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**

@@ -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.

@@ -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.

@@ -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
 ======================================================
@@ -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

@@ -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.

@@ -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
@@ -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
@@ -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
@@ -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.
@@ -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.
@@ -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.
@@ -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.

@@ -66,12 +66,12 @@ Prices per minimum quantity
 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). 
-Prices can be rounded to the nearest cent/dollar or multiple of either 
-(nearest 5 cents, nearest 10 dollars). 
+*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 (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).

 Once installed go to
 :menuselection:`Sales --> Configuration --> Pricelists`
@@ -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).