[IMP] misc: corrected errors in the date import section

Many customers struggle with their web server configuration, notably
regarding the `--proxy-mode` option and the way `X-Forwarded-*` HTTP
request headers are interpreted within Odoo.

The `--proxy-mode` section has been updated to cover the most common
misunderstandings and to give guidances on how to setup a web server.

Odoo always only takes the last entry of the `X-Forwarded-*` request
header because there are situations where it is not possible to
determine which last n-th entry to use. Employees might access their
odoo database via the internal network: connecting directly to nginx,
while customers might access the database via an additional proxy such
as cloudflare. The real IP of employees would be the last inside the
`X-Forwarded-For` chain, while the real IP of customers would be the
*second* last entry inside the chain. It would be incorrect to always
take the same nth last entry inside the chain. The cloudflare's own IP
address must be discarded from the chain. Web servers usually feature
a way to ignore trusted IP from the chain, a way so that the real IP
of the user is always the last entry inside the chain. Odoo relies on
such feature to be active and configured.

Prior discussions about `X-Forwarded-For`:
* odoo/odoo#104947
* odoo/odoo#118629
* odoo/odoo#139536

All `X-Forwarded-*` headers are ignored in case the `X-Forwarded-Host`
header is missing (even with `--proxy-mode`). System admin might be
tempted to not set this header and to set `Host` instead, this is
broken as this a user-agent would be able to spoof `X-Forwarded-Host`
and Odoo would use that instead of the correct `Host`.

Prior discussions about `X-Forwarded-Host`:
* odoo/odoo#63277
* odoo/odoo#70117

closes odoo/documentation#6729

Signed-off-by: Julien Castiaux (juc) <juc@odoo.com>

content/applications/finance/fiscal_localizations/colombia.rst

@@ -4,15 +4,16 @@ Colombia
 
 .. |DIAN| replace:: :abbr:`DIAN (Dirección de Impuestos y Aduanas Nacionales)`
 
-Odoo's Colombian localization package provides accounting, fiscal and legal features in Colombia
-such as chart of accounts, taxes and electronic invoicing.
+Odoo's Colombian localization package provides accounting, fiscal, and legal features for databases
+in Colombia – such as chart of accounts, taxes, and electronic invoicing.
 
-In addition, we have a series of videos covering how to start from scratch, configuration, main
-workflows, and specific use cases.
+In addition, a series of videos on the subject is also available. These videos cover how to start
+from scratch, set up configurations, complete common workflows, and provide in-depth looks at some
+specific use cases as well.
 
 .. seealso::
-   `Odoo Colombian localization videos
-   <https://www.youtube.com/playlist?list=PL1-aSABtP6ABxZshems3snMjx7bj_7ZsZ>`_.
+   `Smart Tutorial - Colombian Localization
+   <https://www.odoo.com/slides/smart-tutorial-localizacion-de-colombia-132>`_.
 
 .. _colombia/configuration:
 
@@ -36,74 +37,78 @@ localization:
      - `l10n_co`
      - Default :ref:`fiscal localization package <fiscal_localizations/packages>`. This module adds
        the base accounting features for the Colombian localization: chart of accounts, taxes,
-       withholdings, identification document type.
+       withholdings, and identification document type.
    * - :guilabel:`Colombian - Accounting Reports`
      - `l10n_co_reports`
      - Includes accounting reports for sending certifications to suppliers for withholdings applied.
    * - :guilabel:`Electronic invoicing for Colombia with Carvajal`
      - `l10n_co_edi`
-     - This module includes the features that are required for the integration with Carvajal and
-       generates the electronic invoices and support document related to the vendor bills based on
+     - This module includes the features required for integration with Carvajal, and
+       generates the electronic invoices and support documents related to the vendor bills, based on
        |DIAN| regulations.
    * - :guilabel:`Colombian - Point of Sale`
      - `l10n_co_pos`
-     - Includes Point of Sale Receipt for Colombian Localization.
+     - Includes Point of Sale receipts for Colombian localization.
 
 .. note::
-   When a database is created from scratch selecting :guilabel:`Colombia` as the country, Odoo
-   automatically installs the base modules *Colombia - Accounting* and *Colombia - Accounting
-   Reports*.
+   When `Colombia` is selected for a company's :guilabel:`Fiscal Localization`, Odoo automatically
+   installs certain modules.
 
 Company configuration
 ---------------------
 
-To configure your company information, go to the :menuselection:`Contacts` app and search for your
-company. Alternatively, activate :ref:`developer mode <developer-mode>` and navigate to
+To configure your company information, go to the :menuselection:`Contacts` app, and search for your
+company.
+
+Alternatively, activate :ref:`developer mode <developer-mode>` and navigate to
 :menuselection:`General Setting --> Company --> Update Info --> Contact`. Then, edit the contact
-form to configure the following information:
+form and configure the following information:
 
 - :guilabel:`Company Name`.
-- :guilabel:`Address`: Including :guilabel:`City`, :guilabel:`Department` and :guilabel:`Zip Code`.
-- :guilabel:`Tax ID`: When it is a `NIT`, it must have the *verification digit* at the end of the ID
-  followed by a hyphen (`-`).
+- :guilabel:`Address`: Including :guilabel:`City`, :guilabel:`Department` and :guilabel:`ZIP` code.
+- :guilabel:`Identification Number`: Select the :guilabel:`Identification Type` (`NIT`, `Cédula de
+  Ciudadanía`, `Registro Civil`, etc.). When the :guilabel:`Identification Type` is `NIT`, the
+  :guilabel:`Identification Number` **must** have the *verification digit* at the end of the ID
+  prefixed by a hyphen (`-`).
 
 Next, configure the :guilabel:`Fiscal Information` in the :guilabel:`Sales & Purchase` tab:
 
 - :guilabel:`Obligaciones y Responsabilidades`: Select the fiscal responsibility for the company
-  (:guilabel:`O-13` Gran Contribuyente, :guilabel:`O-15` Autorretenedor, :guilabel:`O-23` Agente de
-  retención IVA, :guilabel:`O-47` Regimen de tributación simple, :guilabel:`R-99-PN` No Aplica).
+  (`O-13` Gran Contribuyente, `O-15` Autorretenedor, `O-23` Agente de retención IVA, `O-47` Regimen
+  de tributación simple, `R-99-PN` No Aplica).
 - :guilabel:`Gran Contribuyente`: If the company is *Gran Contribuyente* this option should be
   selected.
-- :guilabel:`Fiscal Regimen`: Select the Tribute Name for the company (:guilabel:`IVA`,
-  :guilabel:`INC`, :guilabel:`IVA e INC`, :guilabel:`No Aplica`)
+- :guilabel:`Fiscal Regimen`: Select the Tribute Name for the company (`IVA`, `INC`, `IVA e INC`,
+  or `No Aplica`)
 - :guilabel:`Commercial Name`: If the company uses a specific commercial name, and it needs to be
   displayed in the invoice.
 
 Carjaval credentials configuration
 ----------------------------------
 
-Once the modules installed, the user credentials must be configured in order to connect with
-Carvajal Web Service. Navigate to :menuselection:`Accounting --> Configuration --> Settings` and
-scroll to the :guilabel:`Colombian Electronic Invoicing` section. Then, fill in the required
-configuration information provided by Carvajal:
+Once the modules are installed, the user credentials **must** be configured, in order to connect
+with Carvajal Web Service. To do so, navigate to :menuselection:`Accounting --> Configuration -->
+Settings` and scroll to the :guilabel:`Colombian Electronic Invoicing` section. Then, fill in the
+required configuration information provided by Carvajal:
 
-- :guilabel:`Username` and :guilabel:`Password`: Correspond to the username and password provided
-  by Carvajal to the company.
+- :guilabel:`Username` and :guilabel:`Password`: Username and password (provided by Carvajal) to the
+  company.
 - :guilabel:`Company Registry`: Company's NIT number *without* the verification code.
-- :guilabel:`Account ID`: Company ID followed by `_01`.
-- :guilabel:`Colombia Template Code`: Select one of the two available templates (:guilabel:`CGEN03`
-  or :guilabel:`CGNE04`) to be used in the PDF format of the electronic invoice.
+- :guilabel:`Account ID`: Company's NIT number followed by `_01`.
+- :guilabel:`Colombia Template Code`: Select one of the two available templates (`CGEN03` or
+  `CGNE04`) to be used in the PDF format of the electronic invoice.
+
+Enable the :guilabel:`Test mode` checkbox to connect with the Carvajal testing environment.
+
+Once Odoo and Carvajal are fully configured and ready for production, deactivate the :guilabel:`Test
+mode` checkbox to use the production database.
 
 .. image:: colombia/carvajal-configuration.png
+   :align: center
    :alt: Configure credentials for Carvajal web service in Odoo.
 
-.. note::
-   Check the :guilabel:`Test mode` checkbox to connect with the Carvajal testing environment. Once
-   Odoo and Carvajal are fully configured and ready for production, uncheck the :guilabel:`Test
-   mode` checkbox to use the production database.
-
 .. important::
-   :guilabel:`Test mode` must be used **only** on replicated databases, **not** the production
+   :guilabel:`Test mode` must **only** be used on duplicated databases, **not** the production
    environment.
 
 Report data configuration
@@ -112,8 +117,17 @@ Report data configuration
 Report data can be defined for the fiscal section and bank information of the PDF as part of the
 configurable information sent in the XML.
 
-Navigate to :menuselection:`Accounting --> Configuration --> Settings` and scroll to the
-:guilabel:`Colombian Electronic Invoicing` section.
+Navigate to :menuselection:`Accounting --> Configuration --> Settings`, and scroll to the
+:guilabel:`Colombian Electronic Invoicing` section, in order to find the :guilabel:`Report
+Configuration` fields. Here the header information for each report type can be configured.
+
+- :guilabel:`Gran Contribuyente`
+- :guilabel:`Tipo de Régimen`
+- :guilabel:`Retenedores de IVA`
+- :guilabel:`Autorretenedores`
+- :guilabel:`Resolución Aplicable`
+- :guilabel:`Actividad Económica`
+- :guilabel:`Bank Information`
 
 .. _colombia/master-data:
 
@@ -123,67 +137,85 @@ Master data configuration
 Partner
 ~~~~~~~
 
+Partner contacts can be created in the *Contacts* app. To do so, navigate to
+:menuselection:`Contacts`, and click the :guilabel:`Create` button.
+
+Then, name the contact, and using the radio buttons, select the contact type, either
+:guilabel:`Individual` or :guilabel:`Company`.
+
+Complete the full :guilabel:`Address`, including the :guilabel:`City`, :guilabel:`State`, and
+:guilabel:`ZIP` code. Then, complete the identification and fiscal information.
+
 Identification information
 **************************
 
-Document types defined by the |DIAN| are available on the partner form as part of the Colombian
-localization. Colombian partners must have their :guilabel:`Identification Number` (VAT) and
-:guilabel:`Document Type` set.
+Identification types, defined by the |DIAN|, are available on the partner form, as part of the
+Colombian localization. Colombian partners **must** have their :guilabel:`Identification Number`
+(VAT) and :guilabel:`Document Type` set.
 
 .. tip::
    When the :guilabel:`Document Type` is `NIT`, the :guilabel:`Identification Number` needs to be
-   configured in Odoo, including the *verification digit*; Odoo splits this number when the data to
-   is sent to the third party.
+   configured in Odoo, including the *verification digit at the end of the ID, prefixed by a hyphen
+   (`-`)*.
 
 Fiscal information
 ******************
 
-The partner's responsibility codes (section 53 in the RUT document) are included as part of the
-electronic invoicing module, as it is required by the |DIAN|.
+The partner's responsibility codes (section 53 in the :abbr:`RUT (Registro único tributario)`
+document) are included as part of the electronic invoicing module, as it is required by the |DIAN|.
 
 The required fields can be found under :menuselection:`Partner --> Sales & Purchase Tab --> Fiscal
-Information`:
+Information section`:
 
 - :guilabel:`Obligaciones y Responsabilidades`: Select the fiscal responsibility for the company
-  (:guilabel:`O-13` Gran Contribuyente, :guilabel:`O-15` Autorretenedor, :guilabel:`O-23` Agente de
-  retención IVA, :guilabel:`O-47` Regimen de tributación simple, :guilabel:`R-99-PN` No Aplica).
+  (`O-13` Gran Contribuyente, `O-15` Autorretenedor, `O-23` Agente de retención IVA, `O-47` Regimen
+  de tributación simple, or `R-99-PN` No Aplica).
 - :guilabel:`Gran Contribuyente`: If the company is *Gran Contribuyente* this option should be
   selected.
-- :guilabel:`Fiscal Regimen`: Select the Tribute Name for the company (:guilabel:`IVA`,
-  :guilabel:`INC`, :guilabel:`IVA e INC`, :guilabel:`No Aplica`)
+- :guilabel:`Fiscal Regimen`: Select the tribute name for the company (`IVA`, `INC`, `IVA e INC`, or
+  `No Aplica`)
 - :guilabel:`Commercial Name`: If the company uses a specific commercial name, and it needs to be
   displayed in the invoice.
 
 Products
 ~~~~~~~~
 
-In addition to adding general information (in the :guilabel:`General Information` tab) on the
-product form, either the :guilabel:`UNSPSC Category`, :guilabel:`Barcode`, or :guilabel:`Internal
-Reference` field must also be configured.
+To manage products, navigate to :menuselection:`Accounting --> Customers --> Products`, then click
+on a product.
+
+When adding general information on the product form, it is required that either the
+:guilabel:`UNSPSC Category` (:guilabel:`Accounting` tab), or :guilabel:`Internal Reference`
+(:guilabel:`General Information` tab) field is configured. Be sure to :guilabel:`Save` the product
+once configured.
 
 Taxes
 ~~~~~
 
-If sales transactions include products with taxes, the :guilabel:`Value Type` field in the
-:guilabel:`Advanced Options` tab needs to be configured per tax. To do so, go to
-:menuselection:`Accounting --> Configuration --> Taxes`, and select the related tax.
+To create or modify taxes, go to :menuselection:`Accounting --> Configuration --> Taxes`, and select
+the related tax.
 
-Retention tax types (:guilabel:`ICA`, :guilabel:`IVA`, :guilabel:`Fuente`) are also included. This
-configuration is used to display taxes in the invoice PDF correctly.
+If sales transactions include products with taxes, the :guilabel:`Value Type` field in the
+:guilabel:`Advanced Options` tab needs to be configured per tax. Retention tax types
+(:guilabel:`ICA`, :guilabel:`IVA`, :guilabel:`Fuente`) are also included. This configuration is used
+to display taxes correctly in the invoice PDF.
 
 .. image:: colombia/retention-tax-types.png
+   :align: center
    :alt: The ICA, IVA and Fuente fields in the Advanced Options tab in Odoo.
 
+.. _co-journals:
+
 Sales journals
 ~~~~~~~~~~~~~~
 
-.. _co-journals:
-
 Once the |DIAN| has assigned the official sequence and prefix for the electronic invoice resolution,
-the sales journals related to the invoice documents must be updated in Odoo. To do so, navigate to
-:menuselection:`Accounting --> Configuration --> Journals`.
+the sales journals related to the invoice documents **must** be updated in Odoo. To do so, navigate
+to :menuselection:`Accounting --> Configuration --> Journals`, and select an existing sales journal,
+or create a new one with the :guilabel:`Create` button.
 
-Configure the following data in the :guilabel:`Advanced Settings` tab:
+On the sales journal form, input the :guilabel:`Journal Name`, :guilabel:`Type`, and set a unique
+:guilabel:`Short Code` in the :guilabel:`Journals Entries` tab. Then, configure the following data
+in the :guilabel:`Advanced Settings` tab:
 
 - :guilabel:`Electronic invoicing`: Enable :guilabel:`UBL 2.1 (Colombia)`.
 - :guilabel:`Invoicing Resolution`: Resolution number issued by |DIAN| to the company.
@@ -193,32 +225,31 @@ Configure the following data in the :guilabel:`Advanced Settings` tab:
 - :guilabel:`Range of Numbering (maximum)`: Last authorized invoice number.
 
 .. note::
-   The sequence and resolution of the journal must match the one configured in Carvajal and the
+   The sequence and resolution of the journal **must** match the one configured in Carvajal and the
    |DIAN|.
 
 Invoice sequence
 ****************
 
-The invoice sequence and prefix must be correctly configured when the first document is created.
+The invoice sequence and prefix **must** be correctly configured when the first document is created.
 
 .. note::
-   Odoo automatically assigns a prefix and sequence to the following documents.
+   Odoo automatically assigns a prefix and sequence to the following invoices.
 
 Purchase journals
 *****************
 
-Once the |DIAN| has assigned the official sequence and prefix for the support document related to
+Once the |DIAN| has assigned the official sequence and prefix for the *support document* related to
 vendor bills, the purchase journals related to their supporting documents need to be updated in
 Odoo. The process is similar to the configuration of the :ref:`sales journals <co-journals>`.
 
 Chart of accounts
 *****************
 
-The :doc:`chart of accounts
-</applications/finance/accounting/get_started/chart_of_accounts>` is installed by default as part of
-the localization module, the accounts are mapped automatically in taxes, default account payable,
-and default account receivable. The chart of accounts for Colombia is based on the PUC (Plan Unico
-de Cuentas).
+The :doc:`chart of accounts </applications/finance/accounting/get_started/chart_of_accounts>` is
+installed by default as part of the localization module, the accounts are mapped automatically in
+taxes, default account payable, and default account receivable. The chart of accounts for Colombia
+is based on the PUC (Plan Unico de Cuentas).
 
 .. _colombia/workflows:
 
@@ -228,18 +259,38 @@ Main workflows
 Electronic invoices
 -------------------
 
+The following is a breakdown of the main workflow for electronic invoices with the Colombian
+localization:
+
+#. Sender creates an invoice.
+#. Electronic invoice provider generates the legal XML file.
+#. Electronic invoice provider creates the CUFE (Invoice Electronic Code) with the electronic
+   signature.
+#. Electronic invoice provider sends a notification to |DIAN|.
+#. |DIAN| validates the invoice.
+#. |DIAN| accepts or rejects the invoice.
+#. Electronic invoice provider generates the PDF invoice with a QR code.
+#. Electronic invoice provider sends invoice to the acquirer.
+#. Acquirer sends a receipt of acknowledgement, and accepts or rejects the invoice.
+#. Sender downloads a :file:`.zip` file with the PDF and XML.
+
+.. image:: colombia/workflow-electronic-invoice.png
+   :align: center
+   :alt: Electronic invoice workflow for Colombian localization.
+
 .. _colombia/invoice-creation:
 
 Invoice creation
 ~~~~~~~~~~~~~~~~
 
 .. note::
-   The functional workflow taking place before an invoice validation does not alter the main changes
-   introduced with the electronic invoice.
+   The functional workflow taking place before an invoice validation does **not** alter the main
+   changes introduced with the electronic invoice.
 
 Electronic invoices are generated and sent to both the |DIAN| and customer through Carvajal's web
-service integration. These documents can be created from your sales order or manually. Go to
-:menuselection:`Accounting --> Customers --> Invoices` and configure:
+service integration. These documents can be created from your sales order or manually generated. To
+create a new invoice, go to :menuselection:`Accounting --> Customers --> Invoices`, and select
+:guilabel:`Create`. On the invoice form configure the following fields:
 
 - :guilabel:`Customer`: Customer's information.
 - :guilabel:`Journal`: Journal used for electronic invoices.
@@ -259,9 +310,10 @@ invoice is then processed asynchronously by the E-invoicing service UBL 2.1 (Col
 also displayed in the chatter.
 
 .. image:: colombia/invoice-sent.png
+   :align: center
    :alt: Carvajal XML invoice file in Odoo chatter.
 
-The :guilabel:`Electronic Invoice Name` field is now displayed in the :guilabel:`EDI Documents` tab
+The :guilabel:`Electronic Invoice Name` field is now displayed in the :guilabel:`EDI Documents` tab,
 with the name of the XML file. Additionally, the :guilabel:`Electronic Invoice Status` field is
 displayed with the initial value :guilabel:`To Send`. To process the invoice manually, click on the
 :guilabel:`Process Now` button.
@@ -271,7 +323,7 @@ displayed with the initial value :guilabel:`To Send`. To process the invoice man
 Reception of legal XML and PDF
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The electronic invoice vendor (Carvajal) receives the XML file and proceeds to validate its
+The electronic invoice vendor (Carvajal) receives the XML file, and proceeds to validate its
 structure and information.
 
 After validating the electronic invoice, proceed to generate a legal XML which includes a digital
@@ -279,10 +331,11 @@ signature and a unique code (CUFE), a PDF invoice that includes a QR code and th
 generated. If everything is correct the :guilabel:`Electronic Invoicing` field value changes to
 :guilabel:`Sent`.
 
-A ZIP containing the legal electronic invoice in XML format and the invoice in PDF format is
-downloaded and displayed in the invoice chatter:
+A :file:`.zip` containing the legal electronic invoice (in XML format) and the invoice in (PDF
+format) is downloaded and displayed in the invoice chatter:
 
 .. image:: colombia/invoice-zip.png
+   :align: center
    :alt: ZIP file displayed in the invoice chatter in Odoo.
 
 The electronic invoice status changes to :guilabel:`Accepted`.
@@ -292,7 +345,7 @@ Credit notes
 
 The process for credit notes is the same as for invoices. To create a credit note with reference to
 an invoice, go to :menuselection:`Accounting --> Customers --> Invoices`. On the invoice, click
-:guilabel:`Add Credit Note` and complete the following information:
+:guilabel:`Add Credit Note`, and complete the following information:
 
 - :guilabel:`Credit Method`: Select the type of credit method.
 
@@ -316,7 +369,7 @@ Debit notes
 
 The process for debit notes is similar to credit notes. To create a debit note with reference to an
 invoice, go to :menuselection:`Accounting --> Customers --> Invoices`. On the invoice, click the
-:guilabel:`Add Debit Note` button and complete the following information:
+:guilabel:`Add Debit Note` button, and enter the following information:
 
 - :guilabel:`Reason`: Type the reason for the debit note.
 - :guilabel:`Debit note date`: Select the specific options.
@@ -331,7 +384,7 @@ Support document for vendor bills
 ---------------------------------
 
 With master data, credentials, and the purchase journal configured for support documents related to
-vendor bills, you can start using support documents.
+vendor bills, you can start using *support documents*.
 
 Support documents for vendor bills can be created from your purchase order or manually. Go to
 :menuselection:`Accounting --> Vendors --> Bills` and fill in the following data:
@@ -372,6 +425,7 @@ Commerce (ICA) tax. The report can be found under :menuselection:`Accounting -->
 Colombian Statements --> Certificado de Retención en ICA`.
 
 .. image:: colombia/ica-report.png
+   :align: center
    :alt: Certificado de Retención en ICA report in Odoo Accounting.
 
 Certificado de Retención en IVA
@@ -382,6 +436,7 @@ can be found under :menuselection:`Accounting --> Reporting --> Colombian Statem
 de Retención en IVA`.
 
 .. image:: colombia/iva-report.png
+   :align: center
    :alt: Certificado de Retención en IVA report in Odoo Accounting.
 
 Certificado de Retención en la Fuente
@@ -392,4 +447,5 @@ be found under :menuselection:`Accounting --> Reporting --> Colombian Statements
 Retención en Fuente`.
 
 .. image:: colombia/fuente-report.png
+   :align: center
    :alt: Certificado de Retención en Fuente report in Odoo Accounting.

content/applications/general/export_import_data.rst

@@ -7,13 +7,13 @@ Export and import data
 Export data from Odoo
 =====================
 
-When working with a database, it sometimes is necessary to export your data in a distinct file.
+When working with a database, it is sometimes necessary to export your data in a distinct file.
 Doing so can help to do reporting over your activities (even if Odoo offers a precise and easy
 reporting tool with each available application).
 
 With Odoo, you can export the values from any field in any record. To do so,
-activate the list view on the items that need to be exported, click on *Action*, and, then,
-on *Export*.
+activate the list view on the items that need to be exported, select the records to export, click on
+*Action*, and, then, on *Export*.
 
 .. image:: export_import_data/list-view-export.png
    :align: center
@@ -142,16 +142,16 @@ Odoo can automatically detect if a column is a date, and it will try to guess th
 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'.
+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.
+When inputting dates in a spreadsheet, Odoo recommends using the *ISO 8601* format (`YYYY-MM-DD`) to
+avoid any difficulties during import.
 
-.. note::
-   If you are importing an excel (.xls, .xlsx) file, you can use date cells to store dates as the
-   display of dates in excel is different from the way it is stored. That way you will be sure that
-   the date format is correct in Odoo whatever your locale date format is.
+.. tip::
+   When importing Excel files (.xls, .xlsx), consider using *date cells* to store dates. This
+   maintains locale date formats for display, regardless of how the date is formatted in Odoo. When
+   importing a CSV file, use Odoo’s :guilabel:`Formatting` section to select the date format columns
+   to import.
 
 Can I import numbers with currency sign (e.g.: $32.00)?
 -------------------------------------------------------

content/applications/sales/crm/pipeline/lost_opportunities.rst

@@ -2,77 +2,120 @@
 Manage lost opportunities
 =========================
 
-While working with your opportunities, you might lose some of them. You
-will want to keep track of the reasons you lost them and also which ways
-Odoo can help you recover them in the future.
+Not all opportunities result in successful sales. In order to keep the pipeline up to date, lost
+opportunities need to be identified. Specifying the reason why an opportunity was lost provides
+additional insight that can prove useful for future opportunities.
 
 Mark a lead as lost
 ===================
 
-While in your pipeline, select any opportunity you want and you will see
-a *Mark Lost* button.
+To mark a lead as lost, open the :menuselection:`CRM` application, and select a lead from the
+pipeline, by clicking on its corresponding kanban card. Doing so reveals that lead's detail form.
 
-You can then select an existing *Lost Reason* or create a new one
-right there.
+Then, click :guilabel:`Lost`, located at the top of the lead's detail form.
 
-.. image:: lost_opportunities/lost_opportunities01.png
+.. image:: lost_opportunities/lost-opps-lost-button.png
    :align: center
+   :alt: Buttons from the top of an opportunity record with the lost button emphasized.
 
-Manage & create lost reasons
-----------------------------
+This opens the :guilabel:`Lost Reason` popup. From the drop-down, choose an existing lost reason. If
+no applicable reason is available, create a new one by entering it into the :guilabel:`Lost Reason`
+field, and clicking :guilabel:`Create`.
 
-You will find your *Lost Reasons* under :menuselection:`Configuration --> Lost Reasons`.
+Additional notes and comments can be added below the lost reason designated in the :guilabel:`Lost
+Reason` field.
 
-You can select & rename any of them as well as create a new one from
-there.
+When all the desired information has been entered in the :guilabel:`Lost Reason` pop-up window,
+click :guilabel:`Submit`.
+
+.. image:: lost_opportunities/lost-opps-lost-reason.png
+   :align: center
+   :alt: Lost reasons popup with sample reasons.
+
+Upon clicking :guilabel:`Submit`, the pop-up window disappears, and Odoo returns to the lead detail
+form, where a new red :guilabel:`Lost` banner is now present in the upper-right corner of the lead.
+
+Create/edit lost reasons
+========================
+
+To create a new lost reason, or edit an existing one, navigate to :menuselection:`CRM app -->
+Configuration --> Lost Reasons`.
+
+To edit an existing reason, click on the reason that should be modified. When clicked, that reason
+becomes highlighted. Once highlighted, change the description of the selected lost reason by editing
+the :guilabel:`Description` field. When done, click :guilabel:`Save` in the upper-left corner.
+
+To create a new lost reason, click :guilabel:`Create` in the upper-left corner of the
+:guilabel:`Lost Reasons` page. Doing so reveals a new blank line in the :guilabel:`Description`
+field. Then, proceed to type in the new lost reason in that new line. Once ready, click
+:guilabel:`Save`.
 
 Retrieve lost opportunities
 ===========================
 
-To retrieve lost opportunities and do actions on them (send an email,
-make a feedback call, etc.), select the *Lost* filter in the search
-bar.
+To retrieve lost opportunities in Odoo *CRM*, open the :menuselection:`CRM app` to the main
+:guilabel:`Pipeline` dashboard. Then, click the :guilabel:`Filters` drop-down menu, located beneath
+the search bar.
 
-.. image:: lost_opportunities/lost_opportunities02.png
+.. image:: lost_opportunities/lost-opps-lost-filter.png
    :align: center
+   :alt: Search bar with lost filter emphasized.
 
-You will then see all your lost opportunities.
+From the :guilabel:`Filters` drop-down menu, select the :guilabel:`Lost` option. Upon selecting
+:guilabel:`Lost`, only the leads that have been marked as `Lost` appear on the :guilabel:`Pipeline`
+page.
 
-If you want to refine them further, you can add a filter on the *Lost
-Reason*.
+To filter leads by a specific lost reason, select :menuselection:`Filters --> Add Custom Filter`.
+Doing so reveals another drop-down menu with three fields.
 
-For Example, *Too Expensive*.
+In the top field drop-down menu, select :guilabel:`Lost Reason`. In the second field drop-down menu,
+select :guilabel:`Contains`. Then, in the third field of the :guilabel:`Add Custom Field` sub menu,
+type in the specific keyword(s). Lastly, click :guilabel:`Apply`. Upon clicking :guilabel:`Apply`,
+Odoo reveals all the lost leads with a reason that contains that specified keyword(s).
 
-.. image:: lost_opportunities/lost_opportunities03.png
+.. image:: lost_opportunities/lost-opps-lost-custom-filter.png
    :align: center
+   :alt: Search bar with custom filter added for lost reason.
 
 Restore lost opportunities
 ==========================
 
-From the Kanban view with the filter(s) in place, you can select any
-opportunity you wish and work on it as usual. You can also restore it by
-clicking on *Archived*.
+To restore a lost opportunity, navigate to the main :guilabel:`Pipeline` dashboard on the *CRM* app,
+open the :guilabel:`Filters` drop-down menu, and select the :guilabel:`Lost` option. Doing so
+reveals all the lost opportunities on the :guilabel:`Pipeline` page.
 
-.. image:: lost_opportunities/lost_opportunities04.png
+Then, click on the kanban card of the desired lost opportunity to restore, which opens that lead's
+detail form.
+
+From the lost lead's detail form, click :guilabel:`Restore` in the upper-left corner. Doing so
+removes the red :guilabel:`Lost` banner from the lead form, signifying the lead has been restored.
+
+.. image:: lost_opportunities/lost-opps-restore.png
    :align: center
+   :alt: Lost opportunity with emphasis on the Restore button.
 
-You can also restore items in batch from the Kanban view when they
-belong to the same stage. Select *Restore Records* in the column
-options. You can also archive the same way.
+Restore multiple opportunities at once
+--------------------------------------
 
-.. image:: lost_opportunities/lost_opportunities05.png
-   :align: center
-
-To select specific opportunities, you should switch to the list view.
-
-.. image:: lost_opportunities/lost_opportunities06.png
-   :align: center
-
-Then you can select as many or all opportunities and select the actions
-you want to take.
-
-.. image:: lost_opportunities/lost_opportunities07.png
+To restore multiple opportunities at once, navigate to the main :guilabel:`Pipeline` dashboard in
+the *CRM* app, open the :guilabel:`Filters` drop-down menu, and select the :guilabel:`Lost` option.
+
+Next, select the list view option, which is represented by the three-line :guilabel:`☰ (list)` icon
+in the upper-right corner. Doing so places all the leads from the :guilabel:`Pipeline` page in a
+list form. With the list form chosen, select the checkbox to the left of each desired
+opportunity/lead to be restored.
+
+Once the desired opportunities/leads have been selected, click the :guilabel:`⚙️ Action (gear)`
+drop-down menu at the top of the :guilabel:`Pipeline` page. From the :guilabel:`⚙️ Action (gear)`
+drop-down menu, select :guilabel:`Unarchive`.
+
+Doing so removes those selected lost opportunities from the :guilabel:`Pipeline` page because they
+no longer fit into the `Lost` filter criteria. To reveal these newly-restored leads, delete the
+`Lost` filter from the search bar.
+
+.. image:: lost_opportunities/lost-opps-unarchive.png
    :align: center
+   :alt: Action button from list view with the Unarchive option emphasized.
 
 .. seealso::
-   * :doc:`../performance/win_loss`
+   :doc:`../performance/win_loss`

content/applications/websites/website.rst

@@ -26,3 +26,4 @@ convert visitors into leads or revenues.
    website/pages
    website/configuration
    website/reporting
+   website/mail_groups

content/applications/websites/website/mail_groups.rst

@@ -0,0 +1,131 @@
+===========
+Mail groups
+===========
+
+The **mail groups** feature allows website visitors to have a public discussion by email. They can
+join a group to receive emails from other group members (i.e., website users who have subscribed to
+the group) and send new ones to all group members.
+
+To activate the feature, :ref:`install <general/install>` the :guilabel:`Website Mail Group`
+(`website_mail_group`) module.
+
+.. note::
+   The **mail groups** feature is not to be confused with the
+   :doc:`../../marketing/email_marketing/mailing_lists` in the Email Marketing app.
+
+.. _website/mailing_lists/configure_groups:
+
+Configuring mail groups
+=======================
+
+To configure mail groups, proceed as follows:
+
+#. Configure a custom email alias domain by accessing the **General settings**, scrolling down to
+   the :guilabel:`Discuss` section, enabling the :guilabel:`Custom Email Server` feature, and
+   entering the :guilabel:`Alias domain` (e.g., `@mycompany.com`).
+#. Go to :menuselection:`Website --> Groups --> Mailing List Groups`, then click :guilabel:`Create`.
+#. Specify a :guilabel:`Group Name`, the :guilabel:`Email Alias`, and a :guilabel:`Description`.
+#. Enable :guilabel:`Moderate this group` and specify the :guilabel:`Moderators` if you wish to
+   :ref:`moderate messages <website/mailing_lists/moderate>` from this group. Alternatively, if the
+   group is not moderated, you can define :guilabel:`Responsible users` who can manage the messages
+   in the group.
+#. In the :guilabel:`Privacy` tab, define who can subscribe to the mail group:
+
+   - :guilabel:`Everyone`: to make the mail group public so anyone can subscribe to it;
+   - :guilabel:`Members only`: to only allow users defined as members to subscribe to the mail group;
+   - :guilabel:`Selected group of users`: to only allow users from the :guilabel:`Authorized group`
+     to subscribe to the mail group.
+
+#. If the mail group is moderated, you can automatically notify authors when their message is
+   pending moderation by enabling :guilabel:`Automatic notification` in the :guilabel:`Notify
+   Members` tab and writing the :guilabel:`Notification message`.
+#. If you wish to send out guidelines to new subscribers, enable :guilabel:`Send guidelines to new
+   subscribers` and write them in the :guilabel:`Guidelines` tab. This is particularly useful when
+   the mail group is moderated.
+
+Using mail groups
+=================
+
+Subscribing/unsubscribing
+-------------------------
+
+Based on the :ref:`configuration of the mail group <website/mailing_lists/configure_groups>`,
+users can subscribe to and unsubscribe from mail groups from the website page (`/groups` by default).
+
+.. image:: mail_groups/mail-group-page.png
+   :alt: Mail group web page.
+
+Internal users can also do this from :menuselection:`Website --> Groups --> Mailing List Groups`,
+using the :guilabel:`Join` and :guilabel:`Leave` buttons.
+
+Sending messages
+----------------
+
+To send messages to a mail group, website users can email the :ref:`mail group's email address
+<website/mailing_lists/configure_groups>`. Internal users can also create messages directly from
+Odoo. To do so, go to :menuselection:`Website --> Groups --> Mailing List Groups`, select the mail
+group, click the :guilabel:`Emails` smart button, and click :guilabel:`Create`. Then, fill in the
+fields and click :guilabel:`Send`.
+
+.. tip::
+   - The list of messages can also be accessed by selecting the group from the `/groups` website
+     page.
+   - Group members can also unsubscribe from the group, access the mail group page, and send emails
+     to the group using the URLs in the footer of any group email they have received.
+
+     .. image:: mail_groups/mail-group-URLs.png
+        :alt: URLs in the footer of a group email.
+
+.. _website/mailing_lists/moderate:
+
+Moderating mail group messages
+==============================
+
+If the :guilabel:`Moderate this group` feature has been enabled for the
+:ref:`mail group <website/mailing_lists/configure_groups>`, one of the :guilabel:`Moderators` must
+approve the group's messages before they are dispatched to the other members.
+
+To moderate messages, go to :menuselection:`Website --> Groups --> Mailing List Groups`, select the
+mail group, and click the :guilabel:`To review` smart button. You can moderate messages using the
+buttons at the end of the message line or select a message to view its content and moderate it
+accordingly.
+
+   .. image:: mail_groups/mail-group-moderation.png
+      :alt: Moderation buttons in the message line.
+
+The following actions are available:
+
+- :guilabel:`Accept`: to accept the email and send it to the mail group members.
+- :guilabel:`Reject`: to reject the email. In the pop-up window that opens, click
+  :guilabel:`Reject Silently` to reject the email without notifying the author, or specify an
+  explanation for rejecting the message, then click :guilabel:`Send & Reject` to reject the message
+  and send the explanation to the author.
+- :guilabel:`Whitelist`: to whitelist the author, i.e. automatically accept all of their emails. As
+  a result, a :ref:`moderation rule <website/mailing_lists/moderate>` is created for the author's
+  email address with the status :guilabel:`Always allow`.
+- :guilabel:`Ban`: to blacklist the author, i.e. automatically discard all their emails. In the
+  pop-up window that opens, click :guilabel:`Ban` to ban the author without notifying them, or
+  specify an explanation, then click :guilabel:`Send & Ban` to ban the author and send them the
+  explanation. As a result, a :ref:`moderation rule <website/mailing_lists/moderate>` is created for
+  the author's email address with the status :guilabel:`Permanent ban`.
+
+.. note::
+   Messages can also be moderated from the group's list of messages. Go to :menuselection:`Website
+   --> Groups --> Mailing List Groups`, select the mail group and click the :guilabel:`Emails` smart
+   button.
+
+.. _website/mailing_lists/moderation_rules:
+
+Whitelisting/Blacklisting authors
+=================================
+
+You can whitelist or blacklist an author either directly :ref:`from a mail group message
+<website/mailing_lists/moderate>`, or by creating a moderation rule. To do so, go to
+:menuselection:`Website --> Groups --> List Moderation Rulings` and click :guilabel:`Create`. Then,
+select the :guilabel:`Group`, specify the author's :guilabel:`Email` and set the :guilabel:`Status`
+field.
+
+.. tip::
+   You can also access the mail group's moderation rules by going to :menuselection:`Website -->
+   Groups --> Mailing List Groups`, selecting the group, then clicking the :guilabel:`Moderations`
+   smart button.

content/developer/reference/cli.rst

@@ -425,7 +425,21 @@ HTTP
 .. option:: --proxy-mode
 
     enables the use of ``X-Forwarded-*`` headers through `Werkzeug's proxy
-    support`_. Only enable this when running behind a trusted web proxy!
+    support`_.
+
+    It ignores all ``X-Forwarded-*`` headers in case ``X-Forwarded-Host`` is
+    missing from the request.
+
+    It always gets the real IP from the last entry of the ``X-Forwarded-For``
+    chain. Configure your web server accordingly using directives such as
+    nginx's `set_real_ip_from <https://nginx.org/en/docs/http/ngx_http_realip_module.html>`_
+    in case there are other trusted proxies along the chain that must be ignored.
+
+    ``X-Forwarded-Proto`` and ``X-Forwarded-Host`` are used to update the
+    request root URL, which in turn is used to update the ``web.base.url``
+    system parameter upon a successful admin authentication. This system
+    parameter is used to generate all links for the current database; see
+    :ref:`domain-name/web-base-url`.
 
 
     .. warning:: proxy mode *must not* be enabled outside of a reverse proxy

locale/es/LC_MESSAGES/finance.po

@@ -4,7 +4,6 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Osiris Anael Roman Eras <osiris.roman@yachaytech.edu.ec>, 2021
 # Althay Ramallo Fuentes <arf@odoo.com>, 2021
 # Antonio Trueba, 2021
 # Nicolás Broggi <rnbroggi@gmail.com>, 2021
@@ -47,6 +46,8 @@
 # Iran Villalobos López, 2023
 # Patricia Gutiérrez Capetillo <pagc@odoo.com>, 2023
 # Fernanda Alvarez, 2023
+# Jairo Llopis <yajo.sk8@gmail.com>, 2023
+# Loida Vilaplana, 2023
 # 
 #, fuzzy
 msgid ""
@@ -55,7 +56,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-09 08:39+0000\n"
 "PO-Revision-Date: 2021-11-02 08:47+0000\n"
-"Last-Translator: Fernanda Alvarez, 2023\n"
+"Last-Translator: Loida Vilaplana, 2023\n"
 "Language-Team: Spanish (https://app.transifex.com/odoo/teams/41243/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3605,7 +3606,7 @@ msgstr ""
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:3
 msgid "Cash discounts"
-msgstr "Descuentos de efectivo"
+msgstr "Descuentos por pronto pago"
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:5
 msgid ""
@@ -3615,15 +3616,15 @@ msgid ""
 " in 30 days. This approach can greatly improve your average collection "
 "period."
 msgstr ""
-"Los descuentos en efectivo son incentivos que puede ofrecer a los clientes "
-"para motivarlos a pagar dentro de un período de tiempo específico. Por "
-"ejemplo, ofrece un descuento del 2% si el cliente le paga dentro de los "
+"Los descuentos por pronto pago son incentivos que puede ofrecer a los "
+"clientes para motivarlos a pagar dentro de un período de tiempo específico. "
+"Por ejemplo, ofrece un descuento del 2% si el cliente le paga dentro de los "
 "primeros 5 días de la factura, cuando vence en 30 días. Este enfoque puede "
-"mejorar enormemente su período de recolección promedio."
+"mejorar enormemente su período de cobro promedio."
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:12
 msgid "Set up a cash discount"
-msgstr "Configura un descuento en efectivo"
+msgstr "Configura un descuento por pronto pago"
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:14
 msgid ""
@@ -3633,16 +3634,16 @@ msgid ""
 "price for a 2% discount) and the number of days during which the offer is "
 "valid. You can also change the default balance term if needed."
 msgstr ""
-"Para establecer un descuento en efectivo, vaya a "
+"Para configurar un descuento por pronto pago, vaya a "
 ":menuselection:`Contabilidad --> Configuración --> Facturación --> Plazos de"
 " pago` y haga click en *Crear*. Añada un tipo de plazo *Porcentaje* con un "
 "valor (p.e. 98% del total para un descuento del 2%) y el número de días "
-"durante los cuales la oferta es válida. También puede cambiar el plazo por "
-"defecto del resto de saldo, si es necesario."
+"durante los cuales la oferta es válida. También puede cambiar el periodo de "
+"saldo predeterminado."
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:25
 msgid "Start offering the cash discount"
-msgstr "Comienza a ofrecer el descuento en efectivo"
+msgstr "Ofrezca el descuento por pronto pago"
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:27
 msgid ""
@@ -3652,15 +3653,15 @@ msgid ""
 "having different due dates. Since the discounted price is already "
 "calculated, your payment controls will be simplified."
 msgstr ""
-"Ahora puede crear una factura de cliente y seleccionar el plazo de descuento"
-" de caja que creó. Una vez se valida la factura, Odoo dividirá "
-"automáticamente la cuenta a cobrar en dos vencimientos con diferentes "
-"fechas. Como el importe del descuento se calcula automáticamente, sus "
-"controles se ven simplificados."
+"Ahora puede crear una factura de cliente y seleccionar el plazo de pago con "
+"el descuento por pronto pago que creó. Una vez se valida la factura, Odoo "
+"dividirá automáticamente la cuenta a cobrar en dos vencimientos con "
+"diferentes fechas. Como el precio con el descuento ya está calculado "
+"automáticamente, los controles de pago serán simplificados."
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:37
 msgid "Grant the cash discount"
-msgstr "Ofrece el descuento en efectivo"
+msgstr "Ofrece el descuento por pronto pago"
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:39
 msgid ""
@@ -3672,7 +3673,8 @@ msgstr ""
 "El cliente cumplió el plazo de pago y, por tanto, se beneficia del descuento"
 " en efectivo. Al procesar el apunte bancario, concilie el pago con el apunte"
 " relacionado del diario. Entonces, seleccione el descuento restante y haga "
-"clic en *Crear descuadre* para conciliarlo."
+"clic en *Operaciones manuales* para conciliarlo con el modelo de "
+"conciliación creado. "
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:48
 msgid ""
@@ -3701,8 +3703,8 @@ msgid ""
 "the payment with the two related journal entries."
 msgstr ""
 "Es este caso, el cliente no cumplió el plazo de pago y no puede beneficiarse"
-" del descuento en efectivo. Cuando procese el apunte bancario, concilie el "
-"pago con los dos apuntes relacionados. "
+" del descuento por pronto pago. Cuando procese el apunte bancario, concilie "
+"el pago con los dos apuntes relacionados. "
 
 #: ../../content/applications/finance/accounting/customer_invoices/cash_discounts.rst:67
 msgid ":doc:`payment_terms`"

locale/zh_CN/LC_MESSAGES/finance.po

@@ -35,13 +35,13 @@
 # Raymond Yu <cl_yu@hotmail.com>, 2023
 # Martin Trigaux, 2023
 # Datasource International <Hennessy@datasourcegroup.com>, 2023
-# 稀饭~~ <wangwhai@qq.com>, 2023
 # Emily Jia <eji@odoo.com>, 2023
 # fausthuang, 2023
 # Wil Odoo, 2023
 # Gary Wei <Gary.wei@elico-corp.com>, 2023
 # e2f <projects@e2f.com>, 2023
 # Chloe Wang, 2023
+# 稀饭~~ <wangwhai@qq.com>, 2023
 # 
 #, fuzzy
 msgid ""
@@ -50,7 +50,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-09 08:39+0000\n"
 "PO-Revision-Date: 2021-11-02 08:47+0000\n"
-"Last-Translator: Chloe Wang, 2023\n"
+"Last-Translator: 稀饭~~ <wangwhai@qq.com>, 2023\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -136,6 +136,8 @@ msgid ""
 "several companies but can only work on a single company's accounting at a "
 "time."
 msgstr ""
+"可以在同一个数据库中管理多个公司。每个公司都有自己的:d "
+"oc：`会计科目表<accounting/get_started/chart_of_accounts>`会计，这对于生成合并报告也很有用。用户可以访问多家公司，但一次只能处理一家公司的会计。会计会计"
 
 #: ../../content/applications/finance/accounting.rst:88
 msgid "Multi-currency environment"
@@ -151,6 +153,8 @@ msgid ""
 "Odoo generates currency gains and losses after reconciling the journal "
 "items."
 msgstr ""
+"A :doc:`multi-currency <accounting/get_started/multi_currency>` "
+"Odoo中提供了具有自动汇率以简化国际交易的环境。每笔交易都以公司的默认货币记录;对于以另一种货币发生的交易，Odoo以公司货币存储价值和交易货币价值。Odoo在核对日记帐项目后产生货币损益。"
 
 #: ../../content/applications/finance/accounting.rst:97
 msgid ""
@@ -160,7 +164,7 @@ msgstr ""
 
 #: ../../content/applications/finance/accounting.rst:100
 msgid "International standards"
-msgstr ""
+msgstr "国际标准"
 
 #: ../../content/applications/finance/accounting.rst:102
 msgid ""
@@ -170,6 +174,7 @@ msgid ""
 "to address regional specificities like the chart of accounts, taxes, or any "
 "other requirements."
 msgstr ""
+"Odoo会计支持70多个国家/地区。它提供了所有国家通用的中央标准和机制，并且由于特定于国家的模块，可以满足当地要求。财政状况的存在是为了解决区域特殊性，如会计科目表、税收或任何其他要求。"
 
 #: ../../content/applications/finance/accounting.rst:108
 msgid ":doc:`Fiscal localization packages <fiscal_localizations>`"

locale/zh_CN/LC_MESSAGES/sales.po

@@ -24,6 +24,7 @@
 # Martin Trigaux, 2023
 # Wil Odoo, 2023
 # 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2023
+# Chloe Wang, 2023
 # 
 #, fuzzy
 msgid ""
@@ -32,7 +33,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-26 06:37+0000\n"
 "PO-Revision-Date: 2021-11-02 08:49+0000\n"
-"Last-Translator: 山西清水欧度(QQ:54773801) <54773801@qq.com>, 2023\n"
+"Last-Translator: Chloe Wang, 2023\n"
 "Language-Team: Chinese (China) (https://app.transifex.com/odoo/teams/41243/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1175,11 +1176,11 @@ msgstr ""
 
 #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst-1
 msgid "Create a sales team in Odoo CRM."
-msgstr ""
+msgstr "在 Odoo CRM 中创建销售团队。"
 
 #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:29
 msgid "Add members to a sales team"
-msgstr ""
+msgstr "为销售团队增加成员"
 
 #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:31
 msgid ""
@@ -1189,10 +1190,13 @@ msgid ""
 " that can be assigned to this salesperson in a 30-day period to ensure that "
 "they do not overwork."
 msgstr ""
+"添加团队成员，请在编辑销售团队配置页面时点击 :guilabel:`Members` 标签下的 "
+":guilabel:`Add`。从下拉菜单中选择销售人员或创建新销售人员。设置 30 "
+"天内可分配给该销售人员的最大潜在客户数量，以确保销售人员不会过度劳累。"
 
 #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst-1
 msgid "Add a salesperson in Odoo CRM."
-msgstr ""
+msgstr "在 Odoo CRM 中添加销售人员。"
 
 #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:40
 msgid ""
@@ -1203,14 +1207,14 @@ msgstr ""
 
 #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:44
 msgid "Sales team dashboard"
-msgstr ""
+msgstr "销售团队仪表板"
 
 #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:46
 msgid ""
 "To view the sales team dashboard, go to :menuselection:`CRM --> Sales --> "
 "Teams`. Odoo users will see any teams that they are a part of as dashboard "
 "tiles."
-msgstr ""
+msgstr "查看销售团队仪表板，请跳转至：菜单选择：`CRM-->销售-->团队`。Odoo 用户所属的团队会显示在仪表板的分区中。"
 
 #: ../../content/applications/sales/crm/pipeline/multi_sales_team.rst:49
 msgid ""
@@ -1830,7 +1834,7 @@ msgstr ""
 
 #: ../../content/applications/sales/point_of_sale.rst:114
 msgid "Close the POS session"
-msgstr ""
+msgstr "关闭 PoS 会话"
 
 #: ../../content/applications/sales/point_of_sale.rst:116
 msgid ""
@@ -1901,7 +1905,7 @@ msgstr ""
 
 #: ../../content/applications/sales/point_of_sale/configuration.rst:11
 msgid "Access POS settings"
-msgstr ""
+msgstr "访问 POS 设置"
 
 #: ../../content/applications/sales/point_of_sale/configuration.rst:13
 msgid ""