[MERGE] Forward-port of branch 13.0 to 14.0

accounting/fiscal_localizations/localizations.rst

@@ -6,6 +6,7 @@ Localizations
    :titlesonly:
 
    localizations/argentina
+   localizations/australia
    localizations/chile
    localizations/colombia
    localizations/colombia_ES

accounting/fiscal_localizations/localizations/australia.rst

@@ -0,0 +1,76 @@
+=========
+Australia
+=========
+
+.. _australia/keypay:
+
+KeyPay Australian Payroll
+=========================
+
+The KeyPay Module synchronizes payslip accounting entries (e.g., expenses, social charges,
+liabilities, taxes) from KeyPay to Odoo automatically. Payroll administration is still done in
+KeyPay. We only record the journal entries in Odoo.
+
+Configuration Steps
+-------------------
+
+#. Create a company located in Australia.
+#. Check that the Australian localization module (Australia - Accounting) is installed.
+#. Configure the *KeyPay API*.
+
+   .. image:: media/australia-keypay-api.png
+      :align: center
+      :alt: Odoo Accounting settings includes a section for the Australian Loclization
+
+#. More fields become visible after clicking on *Enable KeyPay Integration*.
+
+   .. image:: media/australia-keypay-integration.png
+      :align: center
+      :alt: Enabling KeyPay Integration in Odoo Accounting displays new fields in the settings
+
+#. You can find the API Key in the *My Account* section of the KeyPay platform.
+
+   .. image:: media/australia-keypay-myaccount.png
+      :align: center
+      :alt: "Account Details" section on the KeyPay dashboard
+
+#. The **Payroll URL** is pre-filled with ``https://keypay.yourpayroll.com.au``. *Please do not
+   change it.*
+#. You can find the **Business ID** in the KeyPay URL. (i.e., ``189241``)
+
+   .. image:: media/australia-keypay-business-id.png
+      :align: center
+      :alt: The KeyPay "Business ID" number is in the URL
+
+#. You can choose any Odoo journal to post the payslip entries.
+
+How does the API work?
+----------------------
+
+The API syncs the journal entries from KeyPay to Odoo and leaves them in draft mode. The reference
+includes the KeyPay payslip entry ID in brackets for the user to easily retrieve the same record in
+KeyPay and Odoo.
+
+.. image:: media/australia-keypay-journal-entry.png
+   :align: center
+   :alt: Example of a KeyPay Journal Entry in Odoo Accounting (Australia)
+
+.. note::
+   The API sync is triggered by scheduled actions.
+
+   .. image:: media/australia-keypay-scheduled-actions.png
+      :align: center
+      :alt: Scheduled Actions settings for KeyPay Payroll in Odoo (debug mode)
+
+KeyPay payslip entries also work based on double-entry bookkeeping. Debit must equal credit (like in
+Odoo).
+
+The accounts used by KeyPay are defined in the section **Payroll settings**.
+
+.. image:: media/australia-keypay-chart-of-accounts.png
+   :align: center
+   :alt: Chart of Accounts menu in KeyPay
+
+For the API to work, you need to create the same accounts as the default accounts of your KeyPay
+business (**same name and same code**) in Odoo. You also need to choose the correct account types in
+Odoo to generate accurate financial reports.

accounting/fiscal_localizations/localizations/mexico.rst

@@ -128,15 +128,15 @@ the entry with this name does not exist).
    :align: center
 
 
-Important considerations when yo enable the CFDI 3.3
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Important considerations when you enable the CFDI 3.3
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Your tax which represent the VAT 16% and 0% must have the "Factor Type" field
 set to "Tasa".
 
-.. image:: media/mexico12.png
+.. image:: media/mx_faq_04.png
    :align: center
-.. image:: media/mexico13.png
+.. image:: media/mx_faq_05.png
    :align: center
 
 You must go to the Fiscal Position configuration and set the proper code (it is
@@ -186,9 +186,9 @@ and then enter your PAC username and PAC password.
    Here is a SAT certificate you can use if you want to use the *Test
    Environment* for the Mexican Accounting Localization.
 
-   - `Certificate`_
-   - `Certificate Key`_
-   - **Password:** 12345678a
+   - :download:`Certificate <../../../_static/files/certificate.cer>`
+   - :download:`Certificate Key <../../../_static/files/certificate.key>`
+   - **Password:** ``12345678a``
 
 
 Configure the tag in sales taxes
@@ -283,263 +283,346 @@ process in Odoo, this considerations to understand the behavior are important.
    **1.1. How can I generate an invoice with payment term `PUE`?**
 
    `According to the SAT documentation`_ a payment is classified as ``PUE`` if
-   the invoice was agreed to be fully payed before the 17th of the next
-   calendar month (the next month of the CFDI date), any other condition
-   will generate a ``PPD`` invoice.
+   it was agreed that the invoice would be fully payed before the 1st of the
+   next calendar month (the month after the one in the CFDI date); any other
+   condition will generate a ``PPD`` invoice.
 
-   **1.2. How can I get this with Odoo?**
+   **1.2. How is this done in Odoo?**
 
-   In order to set the appropriate CFDI payment term (PPD or PUE), you can
-   easily set it by using the ``Payment Terms`` defined in the invoice.
+   The appropriate CFDI payment term (PPD or PUE) is determined by the dates
+   and the ``Payment Terms`` that are selected in the invoice.
 
    - If an invoice is generated without ``Payment Term`` the attribute
-     ``MetodoPago`` will be ``PUE``.
+     ``MetodoPago`` will always be ``PUE``.
 
-   - Today, if is the first day of the month and is generated an invoice with
-     ``Payment Term`` ``30 Net Days`` the ``Due Date`` calculated is going to
-     be the first day of the following month, this means its before the 17th
-     of the next month, then the attribute ``MetodoPago`` will be ``PUE``.
+   - If this is the first week of the month and an invoice is generated
+     with ``Payment Term`` ``15 Net Days`` the calculated ``Due Date`` will
+     be before the 1st of the next month, which will result in the
+     attribute ``MetodoPago`` being ``PUE``.
 
-   - Today, if an invoice is generated with ``Payment Term`` ``30 Net Days``
-     and the ``Due Date`` is higher than the day 17 of the next month the
-     ``MetodoPago`` will be ``PPD``.
+   - If this is not the first week of the month and an invoice is generated 
+     with ``Payment Term`` ``30 Net Days``, the ``Due Date`` will be later higher 
+     than the 1st day of the next month and the ``MetodoPago`` will be ``PPD``.
 
-   - If having a ``Payment Term`` with 2 lines or more, for example
-     ``30% Advance End of Following Month``, this is an installments term,
-     then the attribute ``MetodoPago`` will be ``PPD``.
+   - If the ``Payment Term`` are defined with 2 or more lines (for example
+     ``30% Advance`` and ``End of Following Month``), this is an installments
+     term, and the attribute ``MetodoPago`` will always be ``PPD``.
 
-#. To test a normal signed payment just create an invoice with payment term
-   ``30% Advance End of Following Month`` and then register a payment to it.
+#. To test a normal signed payment just create an invoice with the payment term
+   ``30% Advance, End of Following Month`` and register a payment to it.
 #. You must print the payment in order to retrieve the PDF properly.
-#. Regarding the "Payments in Advance" you must create a proper invoice with
-   the payment in advance itself as a product line setting the proper SAT code
-   following the procedure on the official documentation `given by the SAT`_
+#. Regarding "Payments in Advance" you must create a proper invoice with
+   the advance payment itself as a product line setting the proper SAT code
+   following the procedure in the official documentation `given by the SAT`_
    in the section **Apéndice 2 Procedimiento para la emisión de los CFDI en el
    caso de anticipos recibidos**.
-#. Related to topic 4 it is blocked the possibility to create a Customer
-   Payment without a proper invoice.
+#. Related to topic 4, creating a Customer Payment without a proper invoice
+   is not allowed.
 
 
-Accounting
-----------
-The accounting for Mexico in odoo is composed by 3 reports:
+Electronic Accounting
+---------------------
 
-#. Chart of Account (Called and shown as COA).
+Accounting for Mexico in Odoo is composed of 3 reports:
+
+#. Electronic Chart of Accounts (Called and displayed as COA).
 #. Electronic Trial Balance.
 #. DIOT report.
 
-1. and 2. are considered as the electronic accounting, and the DIOT is a report
-only available on the context of the accounting.
+1. and 2. are considered electronic accounting, and DIOT is a report only available in the context
+of accounting.
 
-You can find all those reports in the original report menu on Accounting app.
+You can find all of those reports in :menuselection:`Accounting --> Reporting --> Mexico`
 
-.. image:: media/mexico16.png
+.. image:: media/mx_ce_01.png
    :align: center
+   :alt: MX reports
 
+Electronic Chart of Accounts (Called and displayed as COA).
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Electronic Accounting (Requires Accounting App)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Electronic invoicing has never been so easy, just go to :menuselection:`Accounting -> Reports ->
+Mexico -> COA` and click the button **Export for SAT (XML)**.
 
-Electronic Chart of account CoA
--------------------------------
-
-The electronic accounting never has been easier, just go to
-:menuselection:`Accounting --> Reporting --> Mexico --> COA` and click on the
-button **Export for SAT (XML)**
-
-.. image:: media/mexico19.png
+.. image:: media/mx_ce_02.png
    :align: center
+   :alt: COA for SAT
 
 How to add new accounts ?
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If you add an account with the coding convention NNN.YY.ZZ where NNN.YY is a
-SAT coding group then your account will be automatically configured.
+If you add an account with the NNN.YY.ZZ encoding convention where NNN.YY is a SAT encoding group,
+your account will be set up automatically.
 
-Example to add an Account for a new Bank account go to
-:menuselection:`Accounting --> Settings --> Chart of Account` and then create
-a new account on the button "Create" and try to create an account with the
-number 102.01.99 once you change to set the name you will see a tag
-automatically set, the tags set are the one picked to be used in the COA on
-xml.
+Example to add an Account for a new Bank account go to :menuselection:`Accounting --> Settings -->
+Chart of Account` and then create a new account in the «Create» button and try to create an
+account with the number 102.01.99 once you change to establish the name you will see an
+automatically configured label, the configured labels are the ones chosen to be used in the COA
+in XML.
 
-.. image:: media/mexico20.png
+.. image:: media/mx_ce_03.png
    :align: center
+   :alt: Create account
 
-What is the meaning of the tag ?
+What is the meaning of the tags?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To know all possible tags you can read the `Anexo 24`_ in the SAT
-website on the section called **Código agrupador de cuentas del SAT**.
+To know all the possible labels, you can read `Annex 24
+<http://www.sat.gob.mx/fichas_tematicas/buzon_tributario/Documents/Anexo24_05012015.pdf>`_
+on the SAT website in the section called **Código agrupador de cuentas del SAT**.
 
 .. tip::
-   When you install the module l10n_mx and yous Chart of Account rely on it
-   (this happen automatically when you install setting Mexico as country on
-   your database) then you will have the more common tags if the tag you need
-   is not created you can create one on the fly.
+   When you install the l10n_mx module and your chart of accounts depends on it (this happens
+   automatically when you install the configuration of Mexico as a country in your database), it
+   will have the most common labels by default. If the tag you need is not created, you can create
+   it.
 
+Trial Balance
+-------------
 
-Electronic Trial Balance
-------------------------
+Exactly like the COA but with the credit and debit of the initial balance, once you have
+correctly configured your COA, you can go to :menuselection:`Reports --> Trial Balance` this is
+automatically generated and can be exported to XML using the button on the top **Export for SAT
+(XML)** with the previous selection of the period you want to export.
 
-Exactly as the COA but with Initial balance debit and credit, once you have
-your coa properly set you can go to :menuselection:`Accounting --> Reports --> Mexico --> Trial Balance`
-this is automatically generated, and can be exported to XML using the button
-in the top  **Export for SAT (XML)** with the previous selection of the
-period you want to export.
-
-.. image:: media/mexico21.png
+.. image:: media/mx_ce_04.png
    :align: center
+   :alt: Electronic verification balance
 
-All the normal auditory and analysis features are available here also as any
-regular Odoo Report.
-
+All normal analysis and listed functions are available here as well as any normal Odoo Report.
 
 DIOT Report (Requires Accounting App)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-What is the DIOT and the importance of presenting it SAT
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+What is DIOT and the importance of presenting it SAT
+****************************************************
 
-When it comes to procedures with the SAT Administration Service we know that
-we should not neglect what we present. So that things should not happen in Odoo.
+When it comes to procedures with the SAT Administration Service, we know that we should not
+neglect what we present.
 
-The DIOT is the Informational Statement of Operations with Third Parties (DIOT),
-which is an an additional obligation with the VAT, where we must give the status
-of our operations to third parties, or what is considered the same, with our
-providers.
+The DIOT is the Informative Declaration of Operations with Third Parties (DIOT), which is an
+additional obligation with VAT, where we must give the status of our operations to third parties,
+or what is considered the same, with our suppliers.
 
-This applies both to individuals and to the moral as well, so if we have VAT
-for submitting to the SAT and also dealing with suppliers it is necessary to.
-submit the DIOT:
+This applies to both individuals and Personas Morales, so if we have VAT to present to the SAT
+and also deal with suppliers it is necessary to send the DIOT.
 
 When to file the DIOT and in what format ?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+******************************************
 
-It is simple to present the DIOT, since like all format this you can obtain
-it in the page of the SAT, it is the electronic format A-29 that you can find
-in the SAT website.
+It is easy to present the DIOT, since, like all formats, you can obtain it on the SAT page, it is
+the electronic form A-29 that you can find on the SAT website.
 
-Every month if you have operations with third parties it is necessary to
-present the DIOT, just as we do with VAT, so that if in January we have deals
-with suppliers, by February we must present the information pertinent to
-said data.
+Every month if you have operations with third parties, it is necessary to present the DIOT, as we
+do with VAT, so if in January we have deals with suppliers, by February we must present the
+information relevant to said data.
 
-Where the DIOT is presented ?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Where is DIOT presented?
+************************
 
-You can present DIOT in different ways, it is up to you which one you will
-choose and which will be more comfortable for you than you will present every
-month or every time you have dealings with suppliers.
+You can present DIOT in different ways, it is up to you which one you will choose and which one
+will be more comfortable for you since you will present it every month or every time you have
+dealings with suppliers.
 
-The A-29 format is electronic so you can present it on the SAT page, but this
-after having made up to 500 records.
+The A-29 form is electronic so you can present it on the SAT page, but this after having made up
+to 500 registrations.
 
-Once these 500 records are entered in the SAT, you must present them to the
-Local Taxpayer Services Administration (ALSC) with correspondence to your tax
-address, these records can be presented in a digital storage medium such as a
-CD or USB, which once validated you will be returned, so do not doubt that you
-will still have these records and of course, your CD or USB.
+Once these 500 records have been entered in the SAT, you must submit them to the Local Taxpayer
+Services Administration (ALSC) with correspondence to your tax address, these records can be
+submitted on a digital storage medium such as a CD or USB, which a Once validated, they will
+return you, so do not doubt that you will still have these discs and of course, your CD or USB.
 
-One more fact to know: the Batch load ?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+One more thing to know: batch loading?
+**************************************
 
-When reviewing the official SAT documents on DIOT, you will find the Batch
-load, and of course the first thing we think is what is that ?, and according
-to the SAT site is:
+When reviewing the official SAT documents in DIOT, you will find the Batch load, and of course
+the first thing we think is what is that ?, and according to the SAT site it is:
 
-The "batch upload" is the conversion of records databases of transactions with
-suppliers made by taxpayers in text files (.txt). These files have the
-necessary structure for their application and importation into the system of
-the Informative Declaration of Operations with third parties, avoiding the
-direct capture and consequently, optimizing the time invested in its
-integration for the presentation in time and form to the SAT.
+The "batch load" is the conversion of databases from records of transactions with suppliers made
+by taxpayers in text files (.txt). These files have the necessary structure for their application
+and import into the Informative Declaration of Operations with third parties system, avoiding
+direct capture and consequently, optimizing the time invested in their integration for the
+presentation in time and form to the SAT.
 
-You can use it to present the DIOT, since it is allowed, which will make this
-operation easier for you, so that it does not exist to avoid being in line
-with the SAT in regard to the Information Statement of Operations with
-Third Parties.
+You can use it to present the DIOT, since it is allowed, which will facilitate this operation, so
+that it does not exist to avoid being in line with the SAT in regards to the Informative
+Declaration of Operations with Third Parties.
 
-You can find the `official information here`_.
+.. seealso::
+   `official information
+   <http://www.sat.gob.mx/fichas_tematicas/declaraciones_informativas/Paginas/declaracion_informativa_terceros.aspx>`_
 
-How Generate this report in Odoo ?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+How to generate this report in Odoo?
+************************************
 
-#. Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions with third partied (DIOT)`.
+#. Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions with third partied
+   (DIOT)`.
 
-   .. image:: media/mexico23.png
+   .. image:: media/mx_ce_05.png
+      :align: center
+      :alt: DIOT report
 
-#. A report view is shown, select last month to report the immediate before
-   month you are or left the current month if it suits to you.
+#. A report view is displayed, select the last month to report the immediately preceding month or
+   leave the current month if it suits you.
 
-   .. image:: media/mexico25.png
+   .. image:: media/mx_ce_06.png
+      :align: center
+      :alt: DIOT filter
 
-#. Click on "Export (TXT).
+#. Click on *Export (XLSX)* or *Print (TXT)*
 
-   .. image:: media/mexico24.png
+.. image:: media/mx_ce_07.png
+      :align: center
+      :alt: Print DIOT
 
-#. Save in a secure place the downloaded file and go to SAT website and follow
-   the necessary steps to declare it.
+#. Save the downloaded file in a safe place, go to the SAT website and follow the necessary steps
+   to declare it.
 
+Important considerations about your supplier and invoice data for DIOT
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Important considerations on your Supplier and Invoice data for the DIOT
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- All suppliers must have the fields configured in the accounting tab called "DIOT Information",
+  the L10N MX Nationality field is completed by simply selecting the appropriate country in the
+  address, not You need to do nothing else there, but the l10n MX type of operation must be
+  configured in all your providers.
 
-- All suppliers must have set the fields on the accounting tab called "DIOT
-  Information", the *L10N Mx Nationality* field is filled with just select the
-  proper country in the address, you do not need to do anything else there, but
-  the *L10N Mx Type Of Operation* must be filled by you in all your suppliers.
+.. image:: media/mx_ce_08.png
+     :align: center
+     :alt: DIOT configuration
 
-  .. image:: media/mexico22.png
+- There are 3 VAT options for this report, 16%, 0% and exempt, one invoice line in Odoo is
+  considered exempt if there is no tax on it, the other 2 taxes are already configured correctly.
+- Remember that to pay an invoice that represents a prepayment, you must first request the invoice
+  and then pay it and properly reconcile the payment following the standard Odoo procedure.
+- You do not need to fill in all your partner data to try to generate the supplier invoice, you
+  can correct this information when you generate the report.
+- Remember that this report only shows vendor invoices that were actually paid.
 
-- There are 3 options of VAT for this report, 16%, 0% and exempt, an invoice
-  line in odoo is considered exempt if no tax on it, the other 2 taxes are
-  properly configured already.
-- Remember to pay an invoice which represent a payment in advance you must
-  ask for the invoice first and then pay it and reconcile properly the payment
-  following standard odoo procedure.
-- You do not need all you data on partners filled to try to generate the
-  supplier invoice, you can fix this information when you generate the report
-  itself.
-- Remember this report only shows the Supplier Invoices that were actually paid.
+If some of these considerations are not taken into account, a message like this will appear when
+you generate the DIOT in TXT with all the partners you need to verify this particular report,
+this is the reason why we recommend to use this report not only for exporting your legal
+information. obligation, but generate it before the end of the month and use it as your auditory
+process to see that all your partners are configured correctly.
 
-If some of this considerations are not taken into account a message like this
-will appear when generate the DIOT on TXT with all the partners you need to
-check on this particular report, this is the reason we recommend use this
-report not just to export your legal obligation but to generate it before
-the end of the month and use it as your auditory process to see all your
-partners are correctly set.
-
-.. image:: media/mexico26.png
+.. image:: media/mx_ce_09.png
    :align: center
+   :alt: DIOT Error
 
+Closing Fiscal Period in Odoo
+-----------------------------
+
+Before proceeding to the close of the fiscal year, there are some steps that you should normally
+take to ensure that your accounting is correct, updated and accurate:
+
+- Make sure that you have fully reconciled your bank account (s) through the end of the year and
+  confirm that the closing book balances match the balances on your bank statements.
+- Verify that all customer invoices have been entered and approved.
+- Confirm that you have entered and approved all vendor bills.
+- Validate all expenses, ensuring their accuracy.
+- Check that all payments received have been entered and recorded exactly.
+
+Year-end checklist
+~~~~~~~~~~~~~~~~~~
+
+- Run a **Tax Report**, and verify that your tax information is correct.
+- Reconcile all accounts on your **Balance Sheet**
+
+  - Compare your bank balances in Odoo against the current bank balances on your statements. Use
+    the report **Bank Reconciliation** to help you with this.
+  - Reconcile all cash and bank account transactions by running your **Old Accounts Receivable**
+    and **Old Accounts Payable** reports
+  - Audit your accounts, making sure you fully understand the transactions that affect them and the
+    nature of the transactions, making sure to include loans and fixed assets.
+
+- Run the optional function **Payments Matching**, under the *More* drop-down on the Journal
+  options from the Accounting dashboard, validating any Vendor Bill and Customer Invoices with its
+  payments. This step is optional, however it can assist the year-end process if all pending
+  payments and invoices are reconciled, and it can lead to finding errors or mistakes in the
+  system.
+- Your accountant will probably like to check your items in the balance sheet and do some Journal
+  Entries for:
+
+  - Manual year-end adjustments, using the **Journal Audit** report (For example, the **Current
+    Earnings for the Year** and **Retained Earnings reports**).
+  - **Work in Progress**.
+  - **Depreciation Journals**.
+  - **Loans**.
+  - **Tax Adjustments**.
+
+If your accountant is on the year-end audit, they will want to have copies of the balance sheet
+items (such as loans, bank accounts, prepayments, sales tax reports, etc ...) to compare against.
+your balances in Odoo.
+
+During this process, it is a good practice setting the **Closing Date for Non-Advisers** to the
+last day of the preceding financial year, which is set under the accounting settings. In this
+way, the accountant can trust that no one else is changing the previous year's transactions while
+auditing the books.
+
+.. image:: media/mx_cc_01.png
+   :align: center
+   :alt: Fiscal year
+
+Accounting Closing Process
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In Odoo there is no need to make a specific year-end entry to close the reporting income accounts
+. The result of the exercise is automatically calculated in the account type (Current Year
+Earnings) and the difference between Income - Expenses will be accumulated to calculate it.
+
+The reports are created in real-time, which means that the **Income Report** corresponds directly
+to the closing date of the year that you specify in Odoo. In addition, at any time that you
+generate the **Income Report**, the start date will correspond to the start date of the **Fiscal
+Year** and the account balances will all be 0.
+
+As of December 31, the Balance Sheet shows the earnings of the Current Year that do not have been
+recognized (Account type Total Current Year Unallocated Earnings in MX account 305.01.01
+['current year earnings' type])
+
+.. image:: media/mx_cc_02.png
+   :align: center
+   :alt: Balance sheet closing
+
+The accountant should create a Journal Entry to recognize the result of the year in Accumulated
+Earnings from previous years on the account "previous years results" account (304.01.01 in
+Mexico) - that is an equity account.
+
+The simplified accounting entry would look like this:
+
+.. image:: media/mx_cc_03.png
+   :align: center
+   :alt: Closing journal entry
+
+Once the accountant has created the journal entry to locate the **Current Earnings for the Year**,
+they must set the **Closing Date** to the last day of the fiscal year. Making sure that before
+doing this, whether or not the current gain of the year in the **Balance Sheet** is properly
+reporting a balance 0.
+
+.. image:: media/mx_cc_04.png
+   :align: center
+   :alt: Check BS closing
 
 Extra Recommended features
 ==========================
 
-Contact Module (Free)
----------------------
+Contacts App (Free)
+-------------------
 
-If you want to administer properly your customers, suppliers and addresses
-this module even if it is not a technical need, it is highly recommended to
-install.
+If you want to properly manage your customers, suppliers and addresses, this module, even if it
+is not a technical need, it is highly recommended to install it.
 
+Multi-currency (Requires Accounting application)
+------------------------------------------------
 
-Multi currency (Requires Accounting App)
-----------------------------------------
+In Mexico, almost all companies send and receive payments in different currencies. If you want to
+do this you can enable the use of multi-currency. You should also enable synchronization with the
+**Mexican Bank Service**, as this would allow you to automatically have the exchange rate from the
+SAT without having to manually create this information every day in Odoo.
 
-In Mexico almost all companies send and receive payments in different
-currencies if you want to manage such capability you should enable the multi
-currency feature and you should enable the synchronization with **Banxico**,
-such feature allow you retrieve the proper exchange rate automatically
-retrieved from SAT and not being worried of put such information daily in the
-system manually.
+Go to settings and enable the multi-currency feature.
 
-Go to settings and enable the multi currency feature.
-
-.. image:: media/mexico17.png
+.. image:: media/mx_mc_01.png
    :align: center
-
+   :alt: Multi currency configuration
 
 Enabling Explicit errors on the CFDI using the XSD local validator (CFDI 3.3)
 -----------------------------------------------------------------------------
@@ -556,8 +639,9 @@ enable, to enable the Check with xsd feature follow the next steps (with the
 - Open any company you have.
 - Click on "Action" and then on "Download XSD file to CFDI".
 
-.. image:: media/mexico18.png
+.. image:: media/mx-xsd-cfdi.png
    :align: center
+   :alt: Download XSD files to CFDI from the Companies list view on Odoo
 
 Now you can make an invoice with any error (for example a product without
 code which is pretty common) and an explicit error will be shown instead a
@@ -566,33 +650,31 @@ generic one with no explanation.
 .. note::
    If you see an error like this:
 
-      The cfdi generated is not valid
-
-      attribute decl. 'TipoRelacion', attribute 'type': The QName value
+   | ``The cfdi generated is not valid``
+   | ``attribute decl. 'TipoRelacion', attribute 'type': The QName value
       '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does
-      not resolve to a(n) simple type definition., line 36
+      not resolve to a(n) simple type definition., line 36``
 
    This can be caused by a database backup restored in anothe server,
    or when the XSD files are not correctly downloaded. Follow the same steps
    as above but:
 
    - Go to the company in which the error occurs.
-   - Click on "Action" and then on "Download XSD file to CFDI".
+   - Click on *Action* and then on *Download XSD file to CFDI*.
 
-
-FAQ
-===
+Common problems and errors
+==========================
 
 - **Error messages** (Only applicable on CFDI 3.3):
 
-  - 9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element
+  - ``9:0:ERROR:SCHEMASV:SCHEMAV_CVC_MINLENGTH_VALID: Element
     '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion':
     [facet 'minLength'] The value '' has a length of '0'; this underruns
-    the allowed minimum length of '1'.
+    the allowed minimum length of '1'.``
 
-  - 9:0:ERROR:SCHEMASV:SCHEMAV_CVC_PATTERN_VALID: Element
+  - ``9:0:ERROR:SCHEMASV:SCHEMAV_CVC_PATTERN_VALID: Element
     '{http://www.sat.gob.mx/cfd/3}Concepto', attribute 'NoIdentificacion':
-    [facet 'pattern'] The value '' is not accepted by the pattern '[^|]{1,100}'.
+    [facet 'pattern'] The value '' is not accepted by the pattern '[^|]{1,100}'.``
 
   **Solution**:
   You forgot to set the proper "Reference" field in the product,
@@ -600,94 +682,130 @@ FAQ
 
 - **Error messages**:
 
-  - 6:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
-    '{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is
-    required but missing.
+  - ``6:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
+    '{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is required but missing.``
 
-  - 5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
-    '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is required but missing.
+  - ``5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
+    '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is required but missing.``
 
   **Solution**:
-  You forget to set the proper "Fiscal Position" on the
-  partner of the company, go to customers, remove the customer filter and
-  look for the partner called as your company and set the proper fiscal
-  position which is the kind of business you company does related to SAT
-  list of possible values, antoher option can be that you forgot follow the
-  considerations about fiscal positions.
+  You forgot to set the proper "Fiscal Position" on the partner of the company. Go to customers,
+  remove the customer filter and look for the partner called as your company and set the proper
+  fiscal position which is the kind of business your company does related to SAT list of possible
+  values, another option can be that you forgot to follow the considerations about fiscal
+  positions.
 
-  Yo must go to the Fiscal Position configuration and set the proper code (it is
-  the first 3 numbers in the name) for example for the test one you should set
-  601, it will look like the image.
+  You need to go to Fiscal Position settings and set the proper code (it is the first 3 numbers
+  of the name), for example, for the test, you need to set 601, it will look like the picture.
 
-  .. image:: media/mexico27.png
+  .. image:: media/mx_faq_01.png
+     :align: center
+     :alt: Fiscal position error
 
   .. tip::
      For testing purposes this value must be set to ``601 - General de Ley
-     Personas Morales`` which is the one required for the demo VAT.
+     Personas Morales`` which is the one required for the VAT demo.
 
 - **Error message**:
 
-  - 2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element
+  - ``2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element
     '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'FormaPago':
     [facet 'enumeration'] The value '' is not an element of the set
     {'01', '02', '03', '04', '05', '06', '08', '12', '13', '14', '15', '17',
-    '23', '24', '25', '26', '27', '28', '29', '30', '99'}
+    '23', '24', '25', '26', '27', '28', '29', '30', '99'}``
 
   **Solution**:
   The payment method is required on your invoice.
 
-  .. image:: media/mexico31.png
+.. image:: media/mx_faq_02.png
+     :align: center
+     :alt: Payment method error
 
 - **Error messages**:
 
-  - 2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element
+  - ``2:0:ERROR:SCHEMASV:SCHEMAV_CVC_ENUMERATION_VALID: Element
     '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion':
-    [facet 'enumeration'] The value '' is not an element of the set {'00
-  - 2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element
+    [facet 'enumeration'] The value '' is not an element of the set {'00``
+  - ``2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element
     '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion':
-    '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.
-  - 5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
-    '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but missing.
+    '' is not a valid value of the atomic type '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.``
+  - ``5:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
+    '{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but missing.``
 
   **Solution**:
-  You must set the address on your company properly, this is a
-  mandatory group of fields, you can go to your company configuration on
-  :menuselection:`Settings --> Users & Companies --> Companies` and fill
-  all the required fields for your address following the step
-  :ref:`mx-legal-info`.
+  You must configure your company address correctly, this is a mandatory group of fields, you can
+  go to your company configuration in :menuselection:`Settings --> Users & Companies --> Companies`
+  and fill complete all the mandatory fields for your address by following the steps in this
+  section: :ref:`mx-legal-info`.
 
 - **Error message**:
 
-  - 2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element
+  - ``2:0:ERROR:SCHEMASV:SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element
     '{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion':
     '' is not a valid value of the atomic type
-    '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.
+    '{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.``
 
   **Solution**:
-  The postal code on your company address is not a valid one
-  for Mexico, fix it.
+  The postal code of your company address is not valid for Mexico, please correct it.
 
-  .. image:: media/mexico32.png
+.. image:: media/mx_faq_03.png
+     :align: center
+     :alt: ZIP code error
 
 - **Error messages**:
 
-  - 18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
+  - ``18:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
     '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is
-    required but missing.
-  - 34:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
+    required but missing.``
+  - ``34:0:ERROR:SCHEMASV:SCHEMAV_CVC_COMPLEX_TYPE_4: Element
     '{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is
-    required but missing.", '')
+    required but missing.", '')``
 
   **Solution**:
-  Set the mexican name for the tax 0% and 16% in your system
-  and used on the invoice.
+  Set the Mexican name for the 0% and 16% tax in your system and use it on the invoice. Your tax,
+  which represents 16% VAT and 0%, must have the **Factor Type** field set to *Tasa*.
 
-  Your tax which represent the VAT 16% and 0% must have the "Factor Type" field
-  set to "Tasa".
+  .. image:: media/mx_faq_04.png
+     :align: center
+     :alt: Factor type error
 
-  .. image:: media/mexico12.png
+  .. image:: media/mx_faq_05.png
+     :align: center
+     :alt: Rate error
 
-  .. image:: media/mexico13.png
+- **Error messages**:
+
+  - | ``CCE159``
+    | ``The XXXX attribute must be registered if the key of cce11: ComercioExterior:
+      TipoOperacion registered is '1' or '2'.``
+
+  **Solution**: It is necessary to specify the Incoterm.
+
+- **Error messages**:
+
+  - | ``CCE209``
+    | ``The attribute cce11: Foreign Trade: Goods: Goods: Customs Unit must have the value
+      specified in the catalog catCFDI: c_FraccionArancelaria column 'UMT' when the attribute
+      cce11: Foreign Trade: Goods: Me``
+
+  **Solution**: The Tariff Fraction must have the code of the unit of measure 01, corresponding
+  to Kilograms.
+
+Glossary
+========
+
+- :abbr:`CFDI (Comprobante Fiscal Digital por Internet)`: Online Digital Tax Receipt
+- :abbr:`CSD (Certificado de Sello Digital)`: Digital Seal Certificate
+- :abbr:`PAC (Proveedores Autorizados de Certificación)`: Authorized Certification Provider
+- Stamp: Digital signature of the electronic invoice
+- Addenda: Complement of information that can be attached to an Internet Digital Tax Receipt
+  (CFDI) normally required by certain companies in Mexico such as Walmart, Tiendas Sorianas, etc.
+- :abbr:`UUID (Universally Unique Identifier)`: It is the acronym in English of the Universally
+  Unique Identifier. The UUID is the equivalent of Folio Fiscal, it is composed of 32 hexadecimal
+  digits, shown in 5 groups separated by hyphens.
+- LCO: List of Obliged Taxpayers (LCO) is a list issued by the SAT that accounts for all the
+  taxpayers whom it authorizes the issuance of invoices and payroll receipts. This means that, to
+  be able to electronically bill your clients, you must be in this database.
 
 .. _SAT: http://www.sat.gob.mx/fichas_tematicas/buzon_tributario/Documents/Anexo24_05012015.pdf
 .. _Finkok: https://www.finkok.com/contacto.html
@@ -695,7 +813,3 @@ FAQ
 .. _`SAT resolution`: http://sat.gob.mx/informacion_fiscal/factura_electronica/Paginas/Anexo_20_version3.3.aspx
 .. _`According to the SAT documentation`: https://www.sat.gob.mx/cs/Satellite?blobcol=urldata&blobkey=id&blobtable=MungoBlobs&blobwhere=1461173400586&ssbinary=true
 .. _`given by the SAT`: http://sat.gob.mx/informacion_fiscal/factura_electronica/Documents/GuiaAnexo20DPA.pdf
-.. _`Anexo 24`: http://www.sat.gob.mx/fichas_tematicas/buzon_tributario/Documents/Anexo24_05012015.pdf
-.. _`official information here`: http://www.sat.gob.mx/fichas_tematicas/declaraciones_informativas/Paginas/declaracion_informativa_terceros.aspx
-.. _`Certificate`: ../../../_static/files/certificate.cer
-.. _`Certificate Key`: ../../../_static/files/certificate.key

general/multi_companies/manage_multi_companies.rst

@@ -40,8 +40,7 @@ Data such as Products, Contacts, and Equipment can be shared or set to be shown
 company only. To do so, on their forms, choose between:
 
 - *A blank field*: the record is shared within all companies.
-- *Adding a company*: the record is visible to users logged in to that specific company and its
-  child companies.
+- *Adding a company*: the record is visible to users logged in to that specific company.
 
 .. image:: media/product_form_company.png
    :align: center