Removing conflicts and a bunch of "you"

Author: mial-odoo

content/applications/finance/fiscal_localizations/mexico.rst

@@ -441,7 +441,7 @@ If a fully-conciliated payment is related to an invoice with a Fiscal Folio, the
 automatically and it'll appear in the |CFDI| tab in both the Invoice and the Payment. 
 
 .. tip::
-   While it is a bad fiscal practice, the PUE payments can also be sent to the government, however it is required 
+   While it is a bad fiscal practice, the |PUE| payments can also be sent to the government, however it is required 
    to press *Force CFDI* in the *CFDI* tab for this.
 
 .. image:: mexico/mx-signed-complement.png
@@ -461,6 +461,77 @@ It is possible to cancel the EDI documents sent to the |SAT|. According to the `
 <https://www.sat.gob.mx/consultas/91447/nuevo-esquema-de-cancelacion>`_, since January 1st, 2022,
 there are two requirements for this:
 
+- With all cancellation requests, you **must** specify a *cancellation reason*.
+- After 24 hours from the invoice creation, the client must be asked to approve the cancellation. If
+  there is no response within 72 hours, the cancellation is processed automatically.
+
+Invoice cancellations can be made for one of the following reasons:
+
+- 01 - Invoice issued with errors (with related document)
+- 02 - Invoice issued with errors (no replacement)
+- 03 - The operation was not carried out
+- 04 - Nominative operation related to the global invoice
+
+To initiate a cancellation, go to :menuselection:`Accounting --> Customers --> Invoices`, select the
+posted invoice to cancel, and click :guilabel:`Request Cancel`. Then, refer to the
+:ref:`localizations/mexico/01-invoice-cancellation` or
+:ref:`localizations/mexico/02-03-04-invoice-cancellation` sections, depending on the cancellation
+reason.
+
+.. tip::
+   Alternatively, request a cancellation from the :guilabel:`CFDI` tab by clicking
+   :guilabel:`Cancel` on the line item.
+
+.. note::
+   If a cancellation is requested on a locked period, the CFDI will be cancelled but not
+   the accounting entry.
+
+.. _localizations/mexico/01-invoice-cancellation:
+
+Cancellation reason 01 - Invoice issued with errors (with related document)
+***************************************************************************
+
+#. In the :guilabel:`Request CFDI Cancellation` pop-up window, select :guilabel:`01 - Invoice issued
+   with errors (with related document)` from the :guilabel:`Reason` field and click
+   :guilabel:`Create Replacement Invoice` to create a new draft invoice. This new draft invoice
+   replaces the previous invoice, along with the related |CFDI|.
+#. :guilabel:`Confirm` the draft and :guilabel:`Send & Print` the invoice.
+#. Return to the initial invoice (i.e., the invoice from which you first requested the
+   cancellation). Notice the :guilabel:`Substituted By` field appears with a reference to the
+   new replacement invoice.
+#. Click :guilabel:`Request Cancel`. In the :guilabel:`Request CFDI Cancellation` pop-up window, the
+   :guilabel:`01 - Invoice issued with errors (with related document)` option is automatically
+   selected in the :guilabel:`Reason` field.
+#. Click :guilabel:`Confirm`.
+
+The invoice cancellation is then generated with a reason line item in the :guilabel:`CFDI` tab.
+
+.. image:: mexico/mx-invoice-cancellation-reason-01.png
+   :alt: Canceled invoice line item in the CFDI tab.
+
+.. note::
+   - If the client rejects the cancellation, the invoice cancellation line item is removed from the
+     :guilabel:`CFDI` tab.
+   - When using the *01 - Invoice issued with errors (with related document)* cancellation reason,
+     the `04|` prefix may appear in the :guilabel:`Fiscal Folio` field. This is an internal prefix
+     used by Odoo to complete the cancellation and **does not** mean that the cancellation reason
+     was *04 - Nominative operation related to the global invoice*.
+
+.. _localizations/mexico/02-03-04-invoice-cancellation:
+
+Cancellation reasons 02, 03, and 04
+***********************************
+
+In the :guilabel:`Request CFDI Cancellation` pop-up window, select the desired cancellation
+:guilabel:`Reason` and :guilabel:`Confirm` the cancellation.
+
+Upon doing so, the invoice cancellation is generated with a reason line item in the :guilabel:`CFDI`
+tab.
+
+.. note::
+   If the client rejects the cancellation, the invoice cancellation line item is removed from the
+   :guilabel:`CFDI` tab.
+
 - With all cancellation requests, a *cancellation reason* **must** be specified.
 - After 24 hours have passed since the creation of the invoice, if certain conditions are met, the 
   client **must** be asked to accept or reject the cancellation.
@@ -991,7 +1062,7 @@ Delivery guide
 A `Carta Porte <https://www.sat.gob.mx/consultas/68823/complemento-carta-porte->`_ is a bill of
 lading: a document that states the type, quantity, and destination of goods being carried.
 
-On July 17th, 2024, version 3.1 of this CFDI was implemented for all transportation providers,
+On July 17th, 2024, version 3.1 of this |CFDI| was implemented for all transportation providers,
 intermediaries, and owners of goods. Odoo is able to generate a document type "T" (Traslado), which,
 unlike other documents, is created in a delivery order instead of an invoice or payment.
 
@@ -1217,7 +1288,7 @@ button to :guilabel:`Validate` the receipt.
 Go to :menuselection:`Inventory --> Operations --> Landed Costs`, and create a new record. Add the
 transfer that you just created, and both: the product `Pedimento` and :guilabel:`Customs number`.
 
-Optionally, you can add a cost amount. After this, validate the landed cost. Once
+Optionally, it is possible to add a cost amount. After this, validate the landed cost. Once
 :guilabel:`Posted`, all products related to that receipt have the customs number assigned.
 
 .. warning::
@@ -1248,15 +1319,15 @@ information on a monthly basis, through the |SAT| website.
 
 It consists of three main XML files:
 
-#. The updated list of the chart of accounts that you are currently using.
+#. The updated list of the chart of accounts that is currently in use.
 #. A monthly trial balance, plus a closing entry report, also known as: *Trial Balance Month 13*.
-#. Either optional, or for a compulsory audit, an export of the journal entries in your general
+#. Either optional, or for a compulsory audit, an export of the journal entries in the general
    ledger.
 
 The resulting XML files follow the requirements of the `Anexo Técnico de Contabilidad Electrónica
 1.3 <https://www.gob.mx/cms/uploads/attachment/file/151135/Anexo24_05012015.pdf>`_.
 
-In addition to this, you can generate the `DIOT
+In addition to this, it is possible to generate the `DIOT
 <https://www.sat.gob.mx/declaracion/74295/presenta-tu-declaracion-informativa-de-operaciones-con-
 terceros-(diot)->`_: A report of vendor's journal entries that involve IVA taxes that can be
 exported in a :file:`.txt` file.
@@ -1291,19 +1362,17 @@ It is possible to create any account, as long as it respects |SAT|'s encoding gr
 .. example::
    Some examples are `102.01.99` or `401.01.001`.
 
-.. warning::
-   By default Odoo will mark the accounts as yellow if the numbering will cause issue later on, this 
-   is to prevent reports from providing innacurate data.
-
 When a new account is created in :menuselection:`Accounting --> Configuration --> Chart of
 Accounts`, with the |SAT| encoding group pattern, the correct grouping code appears in
 :guilabel:`Tags`, and your account appears in the *COA* report.
 
-Once you create all your accounts, make sure the correct :guilabel:`Tags` are added.
+Once all accounts are created, make sure the correct :guilabel:`Tags` are added as these mark the nature
+of the account.
 
 .. note::
    It is not advised use any pattern that ends a section with a 0 (such as `100.01.01`, `301.00.003` or
-   `604.77.00`). This triggers errors in the report.
+   `604.77.00`). This triggers errors in the report. By default Odoo will mark the accounts as yellow if
+   the numbering will cause issue later on, this is to prevent reports from providing innacurate data.
 
 Once everything is set up, you can go to :menuselection:`Accounting --> Reporting --> Trial Balance`, 
 and click the :guilabel:`COA SAT (XML)` button to generate an XML file containing all of your
@@ -1315,9 +1384,9 @@ Trial balance
 The trial balance reports the initial balance, credit, and total balance of your accounts, provided
 that you added their correct :ref:`encoding group <l10n_mx/chart-of-accounts>`.
 
-This report can be generated monthly, and a corresponding XML file is created, if you go to
+This report can be generated monthly, and a corresponding XML file is created, go to
 :menuselection:`Accounting --> Reporting --> Trial Balance`, and click the
-:guilabel:`SAT (XML)` button. Select the month you want to download beforehand.
+:guilabel:`SAT (XML)` button. Select the month to download beforehand.
 
 .. image:: mexico/mx-reports-trial-balance.png
    :alt: Trial balance report.
@@ -1332,9 +1401,9 @@ To generate this XML document, navigate to :menuselection:`Accounting --> Accoun
 and create a new document. Here, add all amounts to modify, and balance the debit and/or credit of each one.
 
 After this is done, go to the :guilabel:`Other Info` tab and check the :guilabel:`Month 13 Closing` field.
-If you go to :menuselection:`Accounting --> Reporting --> Trial Balance` and select the date :guilabel:`Month 13`,
-you'll see the the total amount of the year, plus all the additions of the journal entry, and you'll be able to
-generate the XML file by pressing the :guilabel:`SAT (XML)` button.
+If needed, go to :menuselection:`Accounting --> Reporting --> Trial Balance` and select the date :guilabel:`Month 13`,
+where it is possible to see the the total amount of the year, plus all the additions of the journal entry, and it also
+is possible to generate the XML file by pressing the :guilabel:`SAT (XML)` button.
 
 .. image:: mexico/mx-reports-trial-balance-13.png
    :alt: Trial Balance Month 13 setup.
@@ -1347,7 +1416,7 @@ the underlying journal entries of your invoicing and payments, you can export yo
 to comply with |SAT|'s audits and/or tax refunds.
 
 .. tip::
-   You can filter by period, or by journal, according to your current needs.
+   The report can be filtered by period, or by journal, depending on the need.
 
 To create the XML, go to :menuselection:`Accounting --> Reporting --> Audit Reports --> General
 Ledger`, and click :guilabel:`XML (Polizas)`. Here, you can select between four types of
@@ -1364,7 +1433,7 @@ For :guilabel:`Tax audit`, or :guilabel:`Audit certification`, you need to write
 |SAT|.
 
 .. note::
-   If you want to see this report without sending it, use `ABC6987654/99` for :guilabel:`Order
+   To see this report without sending it, use `ABC6987654/99` for :guilabel:`Order
    Number` and `AB123451234512` for :guilabel:`Process Number`.
 
 DIOT report