diff --git a/accounting.rst b/accounting.rst index 7045767c9..59c495a42 100644 --- a/accounting.rst +++ b/accounting.rst @@ -11,7 +11,7 @@ Invoicing and Accounting accounting/receivables accounting/payables accounting/bank - accounting/fiscality + accounting/taxation accounting/reporting accounting/others accounting/fiscal_localizations \ No newline at end of file diff --git a/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst b/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst index a2c3be1fd..4e5183ca8 100644 --- a/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst +++ b/accounting/fiscal_localizations/overview/fiscal_localization_packages.rst @@ -43,6 +43,6 @@ Please refer to the documentation listed below for more information. .. seealso:: - :doc:`localizations_list` - :doc:`../../overview/getting_started/chart_of_accounts` - - :doc:`../../fiscality/taxes/taxes` + - :doc:`../../taxation/taxes/taxes` .. todo:: update list of linked docs, and link with the future one about country-specific statements. \ No newline at end of file diff --git a/accounting/fiscality.rst b/accounting/fiscality.rst deleted file mode 100644 index b3b325b0e..000000000 --- a/accounting/fiscality.rst +++ /dev/null @@ -1,9 +0,0 @@ -========= -Fiscality -========= - -.. toctree:: - :titlesonly: - - fiscality/taxes - fiscality/fiscal_year \ No newline at end of file diff --git a/accounting/reporting/declarations/tax_returns.rst b/accounting/reporting/declarations/tax_returns.rst index d5ef01c5f..824984cc0 100644 --- a/accounting/reporting/declarations/tax_returns.rst +++ b/accounting/reporting/declarations/tax_returns.rst @@ -120,6 +120,6 @@ with the amount you have to pay or be refunded. above. .. seealso:: - * :doc:`../../fiscality/taxes/taxes` + * :doc:`../../taxation/taxes/taxes` * :doc:`../../overview/getting_started/setup` * :doc:`../../fiscal_localizations/overview/fiscal_localization_packages` \ No newline at end of file diff --git a/accounting/taxation.rst b/accounting/taxation.rst new file mode 100644 index 000000000..42775709d --- /dev/null +++ b/accounting/taxation.rst @@ -0,0 +1,9 @@ +======== +Taxation +======== + +.. toctree:: + :titlesonly: + + taxation/taxes + taxation/fiscal_year \ No newline at end of file diff --git a/accounting/fiscality/fiscal_year.rst b/accounting/taxation/fiscal_year.rst similarity index 100% rename from accounting/fiscality/fiscal_year.rst rename to accounting/taxation/fiscal_year.rst diff --git a/accounting/fiscality/fiscal_year/close_fiscal_year.rst b/accounting/taxation/fiscal_year/close_fiscal_year.rst similarity index 100% rename from accounting/fiscality/fiscal_year/close_fiscal_year.rst rename to accounting/taxation/fiscal_year/close_fiscal_year.rst diff --git a/accounting/fiscality/fiscal_year/fiscal_year.rst b/accounting/taxation/fiscal_year/fiscal_year.rst similarity index 100% rename from accounting/fiscality/fiscal_year/fiscal_year.rst rename to accounting/taxation/fiscal_year/fiscal_year.rst diff --git a/accounting/fiscality/fiscal_year/media/close_fiscal_year01.png b/accounting/taxation/fiscal_year/media/close_fiscal_year01.png similarity index 100% rename from accounting/fiscality/fiscal_year/media/close_fiscal_year01.png rename to accounting/taxation/fiscal_year/media/close_fiscal_year01.png diff --git a/accounting/fiscality/fiscal_year/media/fiscal_year01.png b/accounting/taxation/fiscal_year/media/fiscal_year01.png similarity index 100% rename from accounting/fiscality/fiscal_year/media/fiscal_year01.png rename to accounting/taxation/fiscal_year/media/fiscal_year01.png diff --git a/accounting/fiscality/fiscal_year/media/fiscal_year02.png b/accounting/taxation/fiscal_year/media/fiscal_year02.png similarity index 100% rename from accounting/fiscality/fiscal_year/media/fiscal_year02.png rename to accounting/taxation/fiscal_year/media/fiscal_year02.png diff --git a/accounting/fiscality/fiscal_year/media/fiscal_year03.png b/accounting/taxation/fiscal_year/media/fiscal_year03.png similarity index 100% rename from accounting/fiscality/fiscal_year/media/fiscal_year03.png rename to accounting/taxation/fiscal_year/media/fiscal_year03.png diff --git a/accounting/fiscality/taxes.rst b/accounting/taxation/taxes.rst similarity index 100% rename from accounting/fiscality/taxes.rst rename to accounting/taxation/taxes.rst diff --git a/accounting/fiscality/taxes/B2B_B2C.rst b/accounting/taxation/taxes/B2B_B2C.rst similarity index 100% rename from accounting/fiscality/taxes/B2B_B2C.rst rename to accounting/taxation/taxes/B2B_B2C.rst diff --git a/accounting/fiscality/taxes/cash_basis_taxes.rst b/accounting/taxation/taxes/cash_basis_taxes.rst similarity index 100% rename from accounting/fiscality/taxes/cash_basis_taxes.rst rename to accounting/taxation/taxes/cash_basis_taxes.rst diff --git a/accounting/fiscality/taxes/default_taxes.rst b/accounting/taxation/taxes/default_taxes.rst similarity index 100% rename from accounting/fiscality/taxes/default_taxes.rst rename to accounting/taxation/taxes/default_taxes.rst diff --git a/accounting/fiscality/taxes/fiscal_positions.rst b/accounting/taxation/taxes/fiscal_positions.rst similarity index 100% rename from accounting/fiscality/taxes/fiscal_positions.rst rename to accounting/taxation/taxes/fiscal_positions.rst diff --git a/accounting/fiscality/taxes/media/cash_basis_taxes01.png b/accounting/taxation/taxes/media/cash_basis_taxes01.png similarity index 100% rename from accounting/fiscality/taxes/media/cash_basis_taxes01.png rename to accounting/taxation/taxes/media/cash_basis_taxes01.png diff --git a/accounting/fiscality/taxes/media/cash_basis_taxes02.png b/accounting/taxation/taxes/media/cash_basis_taxes02.png similarity index 100% rename from accounting/fiscality/taxes/media/cash_basis_taxes02.png rename to accounting/taxation/taxes/media/cash_basis_taxes02.png diff --git a/accounting/fiscality/taxes/media/cash_basis_taxes03.png b/accounting/taxation/taxes/media/cash_basis_taxes03.png similarity index 100% rename from accounting/fiscality/taxes/media/cash_basis_taxes03.png rename to accounting/taxation/taxes/media/cash_basis_taxes03.png diff --git a/accounting/fiscality/taxes/media/create01.png b/accounting/taxation/taxes/media/create01.png similarity index 100% rename from accounting/fiscality/taxes/media/create01.png rename to accounting/taxation/taxes/media/create01.png diff --git a/accounting/fiscality/taxes/media/create02.png b/accounting/taxation/taxes/media/create02.png similarity index 100% rename from accounting/fiscality/taxes/media/create02.png rename to accounting/taxation/taxes/media/create02.png diff --git a/accounting/fiscality/taxes/media/default-taxes-configuration.png b/accounting/taxation/taxes/media/default-taxes-configuration.png similarity index 100% rename from accounting/fiscality/taxes/media/default-taxes-configuration.png rename to accounting/taxation/taxes/media/default-taxes-configuration.png diff --git a/accounting/fiscality/taxes/media/default-taxes-invoice-line.png b/accounting/taxation/taxes/media/default-taxes-invoice-line.png similarity index 100% rename from accounting/fiscality/taxes/media/default-taxes-invoice-line.png rename to accounting/taxation/taxes/media/default-taxes-invoice-line.png diff --git a/accounting/fiscality/taxes/media/fiscal-positions-automatic.png b/accounting/taxation/taxes/media/fiscal-positions-automatic.png similarity index 100% rename from accounting/fiscality/taxes/media/fiscal-positions-automatic.png rename to accounting/taxation/taxes/media/fiscal-positions-automatic.png diff --git a/accounting/fiscality/taxes/media/fiscal-positions-intra-community.png b/accounting/taxation/taxes/media/fiscal-positions-intra-community.png similarity index 100% rename from accounting/fiscality/taxes/media/fiscal-positions-intra-community.png rename to accounting/taxation/taxes/media/fiscal-positions-intra-community.png diff --git a/accounting/fiscality/taxes/media/fiscal-positions-partner.png b/accounting/taxation/taxes/media/fiscal-positions-partner.png similarity index 100% rename from accounting/fiscality/taxes/media/fiscal-positions-partner.png rename to accounting/taxation/taxes/media/fiscal-positions-partner.png diff --git a/accounting/fiscality/taxes/media/fiscal-positions-transaction.png b/accounting/taxation/taxes/media/fiscal-positions-transaction.png similarity index 100% rename from accounting/fiscality/taxes/media/fiscal-positions-transaction.png rename to accounting/taxation/taxes/media/fiscal-positions-transaction.png diff --git a/accounting/fiscality/taxes/media/price_B2C_B2B01.png b/accounting/taxation/taxes/media/price_B2C_B2B01.png similarity index 100% rename from accounting/fiscality/taxes/media/price_B2C_B2B01.png rename to accounting/taxation/taxes/media/price_B2C_B2B01.png diff --git a/accounting/fiscality/taxes/media/price_B2C_B2B02.png b/accounting/taxation/taxes/media/price_B2C_B2B02.png similarity index 100% rename from accounting/fiscality/taxes/media/price_B2C_B2B02.png rename to accounting/taxation/taxes/media/price_B2C_B2B02.png diff --git a/accounting/fiscality/taxes/media/price_B2C_B2B03.png b/accounting/taxation/taxes/media/price_B2C_B2B03.png similarity index 100% rename from accounting/fiscality/taxes/media/price_B2C_B2B03.png rename to accounting/taxation/taxes/media/price_B2C_B2B03.png diff --git a/accounting/fiscality/taxes/media/price_B2C_B2B04.png b/accounting/taxation/taxes/media/price_B2C_B2B04.png similarity index 100% rename from accounting/fiscality/taxes/media/price_B2C_B2B04.png rename to accounting/taxation/taxes/media/price_B2C_B2B04.png diff --git a/accounting/fiscality/taxes/media/price_B2C_B2B05.png b/accounting/taxation/taxes/media/price_B2C_B2B05.png similarity index 100% rename from accounting/fiscality/taxes/media/price_B2C_B2B05.png rename to accounting/taxation/taxes/media/price_B2C_B2B05.png diff --git a/accounting/fiscality/taxes/media/retention01.png b/accounting/taxation/taxes/media/retention01.png similarity index 100% rename from accounting/fiscality/taxes/media/retention01.png rename to accounting/taxation/taxes/media/retention01.png diff --git a/accounting/fiscality/taxes/media/retention02.png b/accounting/taxation/taxes/media/retention02.png similarity index 100% rename from accounting/fiscality/taxes/media/retention02.png rename to accounting/taxation/taxes/media/retention02.png diff --git a/accounting/fiscality/taxes/media/retention03.png b/accounting/taxation/taxes/media/retention03.png similarity index 100% rename from accounting/fiscality/taxes/media/retention03.png rename to accounting/taxation/taxes/media/retention03.png diff --git a/accounting/fiscality/taxes/media/retention04.png b/accounting/taxation/taxes/media/retention04.png similarity index 100% rename from accounting/fiscality/taxes/media/retention04.png rename to accounting/taxation/taxes/media/retention04.png diff --git a/accounting/fiscality/taxes/media/taxcloud01.png b/accounting/taxation/taxes/media/taxcloud01.png similarity index 100% rename from accounting/fiscality/taxes/media/taxcloud01.png rename to accounting/taxation/taxes/media/taxcloud01.png diff --git a/accounting/fiscality/taxes/media/taxcloud02.png b/accounting/taxation/taxes/media/taxcloud02.png similarity index 100% rename from accounting/fiscality/taxes/media/taxcloud02.png rename to accounting/taxation/taxes/media/taxcloud02.png diff --git a/accounting/fiscality/taxes/media/taxcloud03.png b/accounting/taxation/taxes/media/taxcloud03.png similarity index 100% rename from accounting/fiscality/taxes/media/taxcloud03.png rename to accounting/taxation/taxes/media/taxcloud03.png diff --git a/accounting/fiscality/taxes/media/taxcloud04.png b/accounting/taxation/taxes/media/taxcloud04.png similarity index 100% rename from accounting/fiscality/taxes/media/taxcloud04.png rename to accounting/taxation/taxes/media/taxcloud04.png diff --git a/accounting/fiscality/taxes/media/taxes-definition.png b/accounting/taxation/taxes/media/taxes-definition.png similarity index 100% rename from accounting/fiscality/taxes/media/taxes-definition.png rename to accounting/taxation/taxes/media/taxes-definition.png diff --git a/accounting/fiscality/taxes/media/taxes-edit.png b/accounting/taxation/taxes/media/taxes-edit.png similarity index 100% rename from accounting/fiscality/taxes/media/taxes-edit.png rename to accounting/taxation/taxes/media/taxes-edit.png diff --git a/accounting/fiscality/taxes/media/taxes-invoice-label.png b/accounting/taxation/taxes/media/taxes-invoice-label.png similarity index 100% rename from accounting/fiscality/taxes/media/taxes-invoice-label.png rename to accounting/taxation/taxes/media/taxes-invoice-label.png diff --git a/accounting/fiscality/taxes/media/taxes-invoice-tax-group.png b/accounting/taxation/taxes/media/taxes-invoice-tax-group.png similarity index 100% rename from accounting/fiscality/taxes/media/taxes-invoice-tax-group.png rename to accounting/taxation/taxes/media/taxes-invoice-tax-group.png diff --git a/accounting/fiscality/taxes/media/taxes-list-sequence.png b/accounting/taxation/taxes/media/taxes-list-sequence.png similarity index 100% rename from accounting/fiscality/taxes/media/taxes-list-sequence.png rename to accounting/taxation/taxes/media/taxes-list-sequence.png diff --git a/accounting/fiscality/taxes/media/taxes-list.png b/accounting/taxation/taxes/media/taxes-list.png similarity index 100% rename from accounting/fiscality/taxes/media/taxes-list.png rename to accounting/taxation/taxes/media/taxes-list.png diff --git a/accounting/fiscality/taxes/media/taxes-subsequent-line.png b/accounting/taxation/taxes/media/taxes-subsequent-line.png similarity index 100% rename from accounting/fiscality/taxes/media/taxes-subsequent-line.png rename to accounting/taxation/taxes/media/taxes-subsequent-line.png diff --git a/accounting/fiscality/taxes/media/vat-validation-configuration.png b/accounting/taxation/taxes/media/vat-validation-configuration.png similarity index 100% rename from accounting/fiscality/taxes/media/vat-validation-configuration.png rename to accounting/taxation/taxes/media/vat-validation-configuration.png diff --git a/accounting/fiscality/taxes/media/vat-validation-contact-form.png b/accounting/taxation/taxes/media/vat-validation-contact-form.png similarity index 100% rename from accounting/fiscality/taxes/media/vat-validation-contact-form.png rename to accounting/taxation/taxes/media/vat-validation-contact-form.png diff --git a/accounting/fiscality/taxes/media/vat-validation-error.png b/accounting/taxation/taxes/media/vat-validation-error.png similarity index 100% rename from accounting/fiscality/taxes/media/vat-validation-error.png rename to accounting/taxation/taxes/media/vat-validation-error.png diff --git a/accounting/fiscality/taxes/retention.rst b/accounting/taxation/taxes/retention.rst similarity index 100% rename from accounting/fiscality/taxes/retention.rst rename to accounting/taxation/taxes/retention.rst diff --git a/accounting/fiscality/taxes/taxcloud.rst b/accounting/taxation/taxes/taxcloud.rst similarity index 100% rename from accounting/fiscality/taxes/taxcloud.rst rename to accounting/taxation/taxes/taxcloud.rst diff --git a/accounting/fiscality/taxes/taxes.rst b/accounting/taxation/taxes/taxes.rst similarity index 100% rename from accounting/fiscality/taxes/taxes.rst rename to accounting/taxation/taxes/taxes.rst diff --git a/accounting/fiscality/taxes/vat_validation.rst b/accounting/taxation/taxes/vat_validation.rst similarity index 100% rename from accounting/fiscality/taxes/vat_validation.rst rename to accounting/taxation/taxes/vat_validation.rst diff --git a/contributing/documentation/introduction_guide.rst b/contributing/documentation/introduction_guide.rst index 4bad2f4c9..8947f3685 100644 --- a/contributing/documentation/introduction_guide.rst +++ b/contributing/documentation/introduction_guide.rst @@ -13,7 +13,7 @@ scratch. .. note:: This tutorial only concerns the `user documentation `_ of Odoo. The documentation for `developing - in Odoo `_ in maintained alongside the + in Odoo `_ is maintained alongside the source code of Odoo at `github.com/odoo/odoo `_. .. _contributing/rst-intro: diff --git a/ecommerce/taxes.rst b/ecommerce/taxes.rst index ad069f49f..c9a91add7 100644 --- a/ecommerce/taxes.rst +++ b/ecommerce/taxes.rst @@ -5,8 +5,8 @@ Collect taxes .. toctree:: :titlesonly: - ../../accounting/fiscality/taxes/default_taxes - ../../accounting/fiscality/taxes/fiscal_positions - ../../accounting/fiscality/taxes/taxes - ../../accounting/fiscality/taxes/taxcloud + ../../accounting/taxation/taxes/default_taxes + ../../accounting/taxation/taxes/fiscal_positions + ../../accounting/taxation/taxes/taxes + ../../accounting/taxation/taxes/taxcloud diff --git a/general/multi_companies/manage_multi_companies.rst b/general/multi_companies/manage_multi_companies.rst index f91423d39..dcd4eae39 100644 --- a/general/multi_companies/manage_multi_companies.rst +++ b/general/multi_companies/manage_multi_companies.rst @@ -84,8 +84,8 @@ Inter-Company Transactions First, make sure each one of your companies is properly set in relation to: - :doc:`Chart of Accounts <../../accounting/overview/getting_started/chart_of_accounts>` -- :doc:`Taxes <../../accounting/fiscality/taxes/default_taxes>` -- :doc:`Fiscal Positions <../../accounting/fiscality/taxes/fiscal_positions>` +- :doc:`Taxes <../../accounting/taxation/taxes/default_taxes>` +- :doc:`Fiscal Positions <../../accounting/taxation/taxes/fiscal_positions>` - :doc:`Journals <../../accounting/bank/setup/bank_accounts>` - :doc:`Fiscal Localizations <../../accounting/fiscal_localizations/overview/fiscal_localization_packages>` - :doc:`Pricelists <../../sales/products_prices/prices/pricing>` diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po index 347c42ab6..03dfb7f9f 100644 --- a/locale/es/LC_MESSAGES/accounting.po +++ b/locale/es/LC_MESSAGES/accounting.po @@ -3906,6 +3906,9 @@ msgid "" "In case you have used some folios in your previous system, make sure you set" " the next valid folio when the first transation is created." msgstr "" +"En caso de que haya utilizado algunas publicaciones en su sistema anterior, " +"asegúrese de configurar la siguiente publicación válida cuando se crea la " +"primera transacción." #: ../../accounting/fiscal_localizations/localizations/chile.rst:344 msgid "Usage and Testing" @@ -6956,6 +6959,10 @@ msgid "" "`Quadrum (formerly Finkok) `_ and `SW" " Sapien - Smarter Web `_." msgstr "" +"Elija un PAC y compre timbres. Actualmente la localización mexicana en Odoo " +"trabaja con dos PAC: `Solución Factible `_, " +"`Quadrum (antes Finkok) `_ y `SW " +"Sapien - Smarter Web `_." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:37 msgid "" @@ -6979,6 +6986,9 @@ msgid "" "To install the Mexican localization module, go to :menuselection:`Apps`, " "then remove the default filter \"Apps\" and search for ``l10n_mx``." msgstr "" +"Para instalar el módulo de localización mexicana, vaya a " +":menuselection:`Apps`, luego elimine el filtro predeterminado \"Apps\" y " +"busque ``l10n_mx``." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:52 msgid "" @@ -6999,10 +7009,12 @@ msgid "" "The following modules are necessary for all databases that require Mexican " "localization:" msgstr "" +"Los siguientes módulos son necesarios para todas las bases de datos que " +"requieren localización mexicana:" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "**Mexico - Accounting (l10n_mx)**" -msgstr "" +msgstr "**México - Contabilidad (l10n_mx)**" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" @@ -7010,26 +7022,34 @@ msgid "" "The installed chart of accounts is based on `the SAT account grouping code " "`_." msgstr "" +"Todos los datos básicos para gestionar la contabilidad, los impuestos y el " +"plan de cuentas. El plan de cuentas instalado se basa en el `código de " +"agrupación de cuentas SAT " +"`_." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "**EDI for Mexico (l10n_mx_edi)**" -msgstr "" +msgstr "**EDI para México (l10n_mx_edi)**" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" "Necessary for electronic transactions, CFDI 3.3, payment complement, and " "addenda on invoices." msgstr "" +"Necesario para transacciones electrónicas, CFDI 3.3, complemento de pago y " +"addendas en facturas." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "**Odoo Mexican localization reports (l10n_mx_reports)**" -msgstr "" +msgstr "**Informes de localización mexicana de Odoo (l10n_mx_reports)**" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" "All mandatory reports for electronic accounting. (Requires the accounting " "application)." msgstr "" +"Todos los informes obligatorios para la contabilidad electrónica. (Requiere " +"la aplicación de contabilidad)." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:68 msgid "" @@ -7038,23 +7058,33 @@ msgid "" "recommended unless you are sure they are needed as they add fields that can " "unnecessarily complicate form filling." msgstr "" +"Los siguientes módulos son opcionales y deben instalarse solo si cumplen con" +" un requisito específico de la organización. No se recomienda instalar estos" +" módulos a menos que esté seguro de que son necesarios, ya que agregan " +"campos que pueden complicar innecesariamente el llenado del formulario." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" "**EDI External Trade Complement for Mexico (l10n_mx_edi_external_trade)**" msgstr "" +"**Complemento de comercio exterior de EDI para México " +"(l10n_mx_edi_external_trade)**" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" "For clients that export, add the foreign trade complement to the CFDI, and " "the logic for filling it." msgstr "" +"Para los clientes que exportan, sume el complemento de comercio exterior al " +"CFDI, y la lógica para llenarlo." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" "**Odoo Mexico Localization for Invoice with customs Number " "(l10n_mx_edi_customs)**" msgstr "" +"** Odoo Localización Mexicana para Factura con número de Aduana " +"(l10n_mx_edi_customs) **" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" @@ -7073,16 +7103,20 @@ msgstr "" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "**Odoo Mexico Localization for Stock / Landing (l10n_mx_edi_landing)**" msgstr "" +"** Odoo Localización Mexicana para Inventario / Costes en Destino " +"(l10n_mx_edi_landing) **" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" "Related to the import module (*l10n_mx_edi_customs*), this module allows " "managing the requests as part of the shipping costs." msgstr "" +"Relacionado con el módulo de importación (* l10n_mx_edi_customs *), este " +"módulo permite gestionar las solicitudes como parte de los gastos de envío." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "**Bank account payment to Mexico (l10n_mx_edi_payment_bank)**" -msgstr "" +msgstr "** Pago de cuenta bancaria a México (l10n_mx_edi_payment_bank) **" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" @@ -7093,6 +7127,8 @@ msgstr "" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "**Odoo Mexico Localization for Sale Coupon (l10n_mx_edi_sale_coupon)**" msgstr "" +"** Odoo Localización Mexicana para Cupón de Venta (l10n_mx_edi_sale_coupon) " +"**" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "" @@ -7105,6 +7141,8 @@ msgid "" "**Tax Cash Basis Entries at Payment Date (l10n_mx_tax_cash_basis)** Create " "journal entries for" msgstr "" +"Relacionado con el módulo de importación (* l10n_mx_edi_customs *), este " +"módulo permite gestionar las solicitudes como parte de los gastos de envío." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:0 msgid "taxes on the payment date (instead of the issue date)." @@ -7159,7 +7197,7 @@ msgid "" "with a real address within Mexico (including all fields) and add " "``EKU9003173C9`` as RFC." msgstr "" -"Si desea probar la localización mexicana, puede configurar la empresa con " +"Si desea probar la Localización Mexicana, puede configurar la empresa con " "una dirección real dentro de México (incluidos todos los campos) y agregar " "`` EKU9003173C9 '' como RFC." @@ -7180,6 +7218,9 @@ msgid "" "--> Fiscal Regime`, and select the option that applies to your company from " "the drop-down list." msgstr "" +"Vaya a: menuselection: `Configuración -> Contabilidad -> Facturación " +"Electrónica (MX) -> Régimen Fiscal`, y seleccione la opción que corresponda " +"a su empresa de la lista desplegable." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:149 msgid "" @@ -7254,6 +7295,8 @@ msgid "" "All products to be sold need to have the SAT code associated with their " "classification so that the invoices do not give an error when validating." msgstr "" +"Todos los productos a vender necesitan tener asociado el código SAT a su " +"clasificación para que las facturas no den error al validar." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:203 msgid "" @@ -7281,6 +7324,11 @@ msgid "" "`_ and `SW Sapien - Smarter Web " "`_." msgstr "" +"Recuerde que debe registrarse directamente con el PAC de su elección antes " +"de comenzar a crear facturas desde Odoo. Tenemos disponibles los siguientes " +"PAC: `Quadrum ` _, `Solución Factible" +" ` _ y `SW Sapien - Smarter Web < " +"https://sw.com.mx/>`_." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:223 msgid "" @@ -7289,6 +7337,10 @@ msgid "" "Test Credentials and return to this process when you have the SAT " "Credentials for your production environment to work with real transactions." msgstr "" +"Debe procesar su ** clave privada (CSD) ** con la institución SAT antes de " +"seguir estos pasos. Si no tiene esta información, pruebe con las " +"Credenciales de prueba y vuelva a este proceso cuando tenga las Credenciales" +" SAT para que su entorno de producción funcione con transacciones reales." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:228 msgid "" @@ -7296,6 +7348,10 @@ msgid "" "Electronic Invoicing (MX)`. Under the **PAC MX** section, enter the name of " "your PAC with your credentials (PAC username and PAC password)." msgstr "" +"Para agregar las credenciales, vaya a: menuselection: `Configuración -> " +"Contabilidad -> Facturación electrónica (MX)`. En la sección ** PAC MX **, " +"ingrese el nombre de su PAC con sus credenciales (nombre de usuario y " +"contraseña de PAC)." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:237 msgid "" @@ -7311,12 +7367,19 @@ msgid "" "*Create* and from there you can upload your digital certificate, your key " "and your password. To finish, click on *Save and Close*." msgstr "" +"Finalmente, cargue los certificados digitales de la empresa dentro del " +"apartado ** Certificados MX **. Haga clic en * Agregar una línea *, se " +"abrirá una ventana, haga clic en * Crear * y desde allí puede cargar su " +"certificado digital, su clave y su contraseña. Para finalizar, haga clic en " +"* Guardar y cerrar *." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:249 msgid "" "If you still do not have one of the contracted PACs and you want to test " "electronic invoicing you can use the following SAT test certificates:" msgstr "" +"Si aún no tienes uno de los PAC contratados y quieres probar la facturación " +"electrónica puedes utilizar los siguientes certificados de prueba SAT:" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:252 msgid ":download:`Certificate <../../../_static/files/certificate.cer>`" @@ -7353,6 +7416,9 @@ msgid "" "`_" " version 3.3 of electronic invoicing of the SAT." msgstr "" +"El proceso de facturación en Odoo se basa en el `Anexo 20 " +"`" +" _ versión 3.3 de facturación electrónica del SAT." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:269 msgid "" @@ -7376,6 +7442,9 @@ msgid "" "find your XML sent to the SAT and the status of the stamping, that is, if it" " was validated or not." msgstr "" +"Los detalles de la factura se reflejarán en Chatter, que es lo que ve a la " +"derecha de la factura en la imagen adjunta. Allí podrás encontrar tu XML " +"enviado al SAT y el estado del sello, es decir, si fue validado o no." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:284 msgid "" @@ -7406,6 +7475,10 @@ msgid "" "`_." " SAT electronic invoicing version is 3.3." msgstr "" +"El proceso de facturación de comercio exterior en Odoo se basa en el " +"correspondiente `Reglamento SAT " +"`" +" _. La versión de facturación electrónica del SAT es la 3.3." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:302 msgid "What do we mean when we talk about foreign trade?" @@ -7416,6 +7489,8 @@ msgid "" "Since January 2018, the SAT requires a Foreign Trade Supplement in export " "transactions." msgstr "" +"Desde enero de 2018, el SAT exige un Suplemento de Comercio Exterior en las " +"transacciones de exportación." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:307 msgid "What is the Foreign Trade complement?" @@ -7498,11 +7573,11 @@ msgstr "" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:344 msgid "EDI for Mexico (l10n_mx_edi)" -msgstr "" +msgstr "EDI para Mexico (l10n_mx_edi)" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:350 msgid "EDI for Mexico (l10n_mx_edi_extended)" -msgstr "" +msgstr "EDI para Mexico (l10n_mx_edi_extended)" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:357 msgid "Company" @@ -7557,6 +7632,8 @@ msgid "" "You must select the **UMT Aduana** (Unit of Measure) in *KG* since it is " "only accepted by the SAT" msgstr "" +"Debes seleccionar la ** UMT Aduana ** (Unidad de medida) en * KG * ya que " +"solo es aceptada por el SAT" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:399 msgid "The weight refers to **the unit weight** of the product" @@ -7748,6 +7825,12 @@ msgid "" " of the invoice - as indicated in the previous point in the **Payment " "Terms**." msgstr "" +"`De acuerdo con la documentación del SAT " +"` " +"_, puede haber 2 tipos de pago: ** PUE ** o ** PPD **. En ambos casos el " +"proceso de pago en Odoo es el mismo, la diferencia de si el pago es PUE o " +"PPD radica en el plazo de pago de la factura - como se indica en el punto " +"anterior en las ** Condiciones de Pago **." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:513 msgid "" @@ -8304,7 +8387,7 @@ msgstr "" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1030 msgid "Accounting for Mexico in Odoo is composed of 3 reports:" -msgstr "La contabilidad de México en Odoo se compone de 3 informes:" +msgstr "La Contabilidad de México en Odoo se compone de 3 informes:" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1032 #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1046 @@ -8330,6 +8413,8 @@ msgid "" "You can find all of those reports in :menuselection:`Accounting --> " "Reporting --> Mexico`" msgstr "" +"Puede encontrar todos esos informes en: menuselection: `Contabilidad -> " +"Informes -> México`" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1048 msgid "" @@ -8337,6 +8422,9 @@ msgid "" ":menuselection:`Accounting -> Reports -> Mexico -> COA` and click the button" " **Export for SAT (XML)**." msgstr "" +"La facturación electrónica nunca ha sido tan fácil, simplemente vaya a: " +"menuselection: `Contabilidad -> Reportes -> México -> COA` y haga clic en el" +" botón ** Exportar para SAT (XML) **." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1056 msgid "How to add new accounts ?" @@ -8369,6 +8457,10 @@ msgid "" " on the SAT website in the section called **Código agrupador de cuentas del " "SAT**." msgstr "" +"Para conocer todas las posibles categorías, puede leer el `Anexo 24 " +"`" +" _ en el sitio web del SAT en la sección denominada ** Código agrupador de " +"cuentas del SAT **." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1079 msgid "" @@ -8377,6 +8469,10 @@ msgid "" " 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." msgstr "" +"Cuando instalas el módulo l10n_mx y tu plan de cuentas depende de él (esto " +"sucede automáticamente cuando instalas la configuración de México como país " +"en tu base de datos), tendrás las etiquetas más comunes por defecto. Si no " +"se crea la etiqueta que necesitas, puedes crearla tú mismo." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1085 msgid "Trial Balance" @@ -8506,6 +8602,9 @@ msgid "" "`official information " "`_" msgstr "" +"`información oficial " +"`" +" _" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1160 msgid "How to generate this report in Odoo?" @@ -8516,6 +8615,8 @@ msgid "" "Go to :menuselection:`Accounting --> Reports --> Mexico --> Transactions " "with third partied (DIOT)`." msgstr "" +"Vaya a: menú de selección: `Contabilidad -> Informes -> México -> " +"Transacciones con terceros (DIOR)`." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1169 msgid "" @@ -8545,6 +8646,11 @@ msgid "" " else there, but the l10n MX type of operation must be configured in all " "your providers." msgstr "" +"Todos los proveedores deben tener los campos configurados en la pestaña de " +"contabilidad denominada \"Información DIOT\", el campo Nacionalidad L10N MX " +"se completa simplemente seleccionando el país correspondiente en la " +"dirección, no necesita hacer nada más allí, sino el tipo de operación l10n " +"MX debe estar configurado en todos sus proveedores." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1197 msgid "" @@ -8733,6 +8839,9 @@ msgid "" "that do not have been recognized (Account type Total Current Year " "Unallocated Earnings in MX account 305.01.01 ['current year earnings' type])" msgstr "" +"Al 31 de diciembre, el balance general muestra las ganancias del año actual " +"que no se han reconocido (tipo de cuenta Total de ganancias no asignadas del" +" año actual en la cuenta MX 305.01.01 [tipo 'ganancias del año actual'])" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1289 msgid "" @@ -8740,6 +8849,9 @@ msgid "" "year in Accumulated Earnings from previous years on the account \"previous " "years results\" account (304.01.01 in Mexico) - that is an equity account." msgstr "" +"El contador debe crear un Asiento Contable para reconocer el resultado del " +"año en las Ganancias Acumuladas de años anteriores en la cuenta \"resultados" +" de años anteriores\" (304.01.01 en México), que es una cuenta de capital." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1293 msgid "The simplified accounting entry would look like this:" @@ -8781,6 +8893,12 @@ msgid "" "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." msgstr "" +"En México, casi todas las empresas envían y reciben pagos en diferentes " +"monedas. Si desea hacer esto, puede habilitar el uso de Multi-Monedas. " +"También debes habilitar la sincronización con el ** Servicio de Banco de " +"Mexico **, ya que esto te permitiría tener automáticamente el tipo de cambio" +" del SAT sin tener que crear manualmente esta información todos los días en " +"Odoo." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1325 msgid "Go to settings and enable the multi-currency feature." @@ -8850,6 +8968,9 @@ msgid "" "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' does " "not resolve to a(n) simple type definition., line 36``" msgstr "" +"`` atributo decl. 'TipoRelacion', atributo 'type': El valor QName " +"'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_TipoRelacion' no se " +"resuelve en una (n) definición de tipo simple., Línea 36` '" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1362 msgid "" @@ -8881,6 +9002,10 @@ msgid "" "[facet 'minLength'] The value '' has a length of '0'; this underruns the " "allowed minimum length of '1'.``" msgstr "" +"`` 9: 0: ERROR: SCHEMASV: SCHEMAV_CVC_MINLENGTH_VALID: Element " +"'{http://www.sat.gob.mx/cfd/3}Concepto', atributo 'NoIdentificacion': [facet" +" 'minLength'] El valor '' tiene una longitud de '0'; esto no alcanza la " +"longitud mínima permitida de '1'. ''" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1379 msgid "" @@ -8889,6 +9014,10 @@ msgid "" "[facet 'pattern'] The value '' is not accepted by the pattern " "'[^|]{1,100}'.``" msgstr "" +"`` 9: 0: ERROR: SCHEMASV: SCHEMAV_CVC_PATTERN_VALID: Elemento " +"'{http://www.sat.gob.mx/cfd/3}Concepto', atributo 'NoIdentificación': " +"[faceta 'patrón'] El valor '' es no aceptado por el patrón '[^ |] {1,100}'. " +"``" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1383 msgid "" @@ -8911,6 +9040,9 @@ msgid "" "'{http://www.sat.gob.mx/cfd/3}RegimenFiscal': The attribute 'Regimen' is " "required but missing.``" msgstr "" +"`` 6: 0: ERROR: SCHEMASV: SCHEMAV_CVC_COMPLEX_TYPE_4: Element " +"'{http://www.sat.gob.mx/cfd/3}RegimenFiscal': El atributo 'Régimen' es " +"obligatorio pero falta ''." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1392 msgid "" @@ -8918,6 +9050,9 @@ msgid "" "'{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'RegimenFiscal' is " "required but missing.``" msgstr "" +"`` 5: 0: ERROR: SCHEMASV: SCHEMAV_CVC_COMPLEX_TYPE_4: Element " +"'{http://www.sat.gob.mx/cfd/3}Emisor': El atributo 'RegimenFiscal' es " +"obligatorio pero falta ''." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1395 msgid "" @@ -8955,6 +9090,11 @@ msgid "" "'04', '05', '06', '08', '12', '13', '14', '15', '17', '23', '24', '25', " "'26', '27', '28', '29', '30', '99'}``" msgstr "" +"`` 2: 0: ERROR: SCHEMASV: SCHEMAV_CVC_ENUMERATION_VALID: Elemento " +"'{http://www.sat.gob.mx/cfd/3}Comprobante', atributo 'FormaPago': [faceta " +"'enumeración'] El valor '' es no es un elemento del conjunto {'01', '02', " +"'03', '04', '05', '06', '08', '12', '13', '14', '15' , '17', '23', '24', " +"'25', '26', '27', '28', '29', '30', '99'} '" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1421 msgid "**Solution**: The payment method is required on your invoice." @@ -8966,6 +9106,9 @@ msgid "" "'{http://www.sat.gob.mx/cfd/3}Comprobante', attribute 'LugarExpedicion': " "[facet 'enumeration'] The value '' is not an element of the set {'00``" msgstr "" +"`` 2: 0: ERROR: SCHEMASV: SCHEMAV_CVC_ENUMERATION_VALID: Elemento " +"'{http://www.sat.gob.mx/cfd/3}Comprobante', atributo 'LugarExpedicion': " +"[faceta 'enumeración'] El valor '' es no es un elemento del conjunto {'00 ''" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1433 #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1447 @@ -8975,6 +9118,10 @@ msgid "" "is not a valid value of the atomic type " "'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos}c_CodigoPostal'.``" msgstr "" +"`` 2: 0: ERROR: SCHEMASV: SCHEMAV_CVC_DATATYPE_VALID_1_2_1: Element " +"'{http://www.sat.gob.mx/cfd/3}Comprobante', atributo 'LugarExpedicion': '' " +"no es un valor válido de tipo atómico " +"'{http://www.sat.gob.mx/sitio_internet/cfd/catalogos} c_CodigoPostal'.``" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1436 msgid "" @@ -8982,6 +9129,9 @@ msgid "" "'{http://www.sat.gob.mx/cfd/3}Emisor': The attribute 'Rfc' is required but " "missing.``" msgstr "" +"`` 5: 0: ERROR: SCHEMASV: SCHEMAV_CVC_COMPLEX_TYPE_4: Element " +"'{http://www.sat.gob.mx/cfd/3}Emisor': El atributo 'Rfc' es obligatorio pero" +" falta ''." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1439 msgid "" @@ -8991,12 +9141,19 @@ msgid "" "complete all the mandatory fields for your address by following the steps in" " this section: :ref:`mx-legal-info`." msgstr "" +"** Solución **: Debes configurar correctamente la dirección de tu empresa, " +"este es un grupo de campos obligatorio, puedes ir a la configuración de tu " +"empresa en: menuselection: `Configuración -> Usuarios & Empresas -> " +"Empresas` y completar completar todo los campos obligatorios para su " +"dirección siguiendo los pasos de esta sección:: ref: `mx-legal-info`." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1452 msgid "" "**Solution**: The postal code of your company address is not valid for " "Mexico, please correct it." msgstr "" +"** Solución **: El código postal de la dirección de su empresa no es válido " +"para México, por favor corríjalo." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1461 msgid "" @@ -9004,6 +9161,9 @@ msgid "" "'{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is " "required but missing.``" msgstr "" +"`` 18: 0: ERROR: SCHEMASV: SCHEMAV_CVC_COMPLEX_TYPE_4: Element " +"'{http://www.sat.gob.mx/cfd/3}Traslado': El atributo 'TipoFactor' es " +"obligatorio pero falta ''." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1464 msgid "" @@ -9011,6 +9171,9 @@ msgid "" "'{http://www.sat.gob.mx/cfd/3}Traslado': The attribute 'TipoFactor' is " "required but missing.\", '')``" msgstr "" +"`34: 0: ERROR: SCHEMASV: SCHEMAV_CVC_COMPLEX_TYPE_4: Element " +"'{http://www.sat.gob.mx/cfd/3}Traslado': El atributo 'TipoFactor' es " +"obligatorio pero falta.\", '') ` '" #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1468 msgid "" @@ -9080,6 +9243,9 @@ msgid "" "Digital Tax Receipt (CFDI) normally required by certain companies in Mexico " "such as Walmart, Tiendas Sorianas, etc." msgstr "" +"Addenda: Complemento de información que se puede adjuntar a un Recibo de " +"Impuesto Digital de Internet (CFDI) normalmente requerido por ciertas " +"empresas en México como Walmart, Tiendas Sorianas, etc." #: ../../accounting/fiscal_localizations/localizations/mexico.rst:1507 msgid "" diff --git a/redirects.txt b/redirects.txt index af48b04f7..c1475fd45 100644 --- a/redirects.txt +++ b/redirects.txt @@ -55,17 +55,17 @@ accounting/bank/feeds/coda.rst accounting/bank/feeds/bank_statements.rst accounting/bank/feeds/ofx.rst accounting/bank/feeds/bank_statements.rst # ofx --> bank_statements [merged] (#569) accounting/bank/feeds/qif.rst accounting/bank/feeds/bank_statements.rst # qif --> bank_statements [merged] (#569) accounting/receivables/customer_invoices/installment_plans.rst accounting/receivables/customer_invoices/payment_terms.rst # installment_plans --> payment_terms [merged] (#573) -accounting/others/adviser/fiscalyear.rst accounting/fiscality/fiscal_year/close_fiscal_year.rst # others/adviser/fiscalyear --> fiscality/fiscal_year/close_fiscal_year (#575) -accounting/others/configuration/fiscal_year.rst accounting/fiscality/fiscal_year/fiscal_year.rst # others/configuration/* --> fiscality/fiscal_year/* (#575) -accounting/others/taxes.rst accounting/fiscality/taxes.rst # others/* --> fiscality/* (#575) -accounting/others/taxes/B2B_B2C.rst accounting/fiscality/taxes/B2B_B2C.rst # others/* --> fiscality/* (#575) -accounting/others/taxes/application.rst accounting/fiscality/taxes/application.rst # others/* --> fiscality/* (#575) -accounting/others/taxes/cash_basis_taxes.rst accounting/fiscality/taxes/cash_basis_taxes.rst # others/* --> fiscality/* (#575) -accounting/others/taxes/create.rst accounting/fiscality/taxes/create.rst # others/* --> fiscality/* (#575) -accounting/others/taxes/default_taxes.rst accounting/fiscality/taxes/default_taxes.rst # others/* --> fiscality/* (#575) -accounting/others/taxes/retention.rst accounting/fiscality/taxes/retention.rst # others/* --> fiscality/* (#575) -accounting/others/taxes/tax_included.rst accounting/fiscality/taxes/tax_included.rst # others/* --> fiscality/* (#575) -accounting/others/taxes/taxcloud.rst accounting/fiscality/taxes/taxcloud.rst # others/* --> fiscality/* (#575) +accounting/others/adviser/fiscalyear.rst accounting/taxation/fiscal_year/close_fiscal_year.rst # others/adviser/fiscalyear --> taxation/fiscal_year/close_fiscal_year (#575) +accounting/others/configuration/fiscal_year.rst accounting/taxation/fiscal_year/fiscal_year.rst # others/configuration/* --> taxation/fiscal_year/* (#575) +accounting/others/taxes.rst accounting/taxation/taxes.rst # others/* --> taxation/* (#575) +accounting/others/taxes/B2B_B2C.rst accounting/taxation/taxes/B2B_B2C.rst # others/* --> taxation/* (#575) +accounting/others/taxes/application.rst accounting/taxation/taxes/application.rst # others/* --> taxation/* (#575) +accounting/others/taxes/cash_basis_taxes.rst accounting/taxation/taxes/cash_basis_taxes.rst # others/* --> taxation/* (#575) +accounting/others/taxes/create.rst accounting/taxation/taxes/create.rst # others/* --> taxation/* (#575) +accounting/others/taxes/default_taxes.rst accounting/taxation/taxes/default_taxes.rst # others/* --> taxation/* (#575) +accounting/others/taxes/retention.rst accounting/taxation/taxes/retention.rst # others/* --> taxation/* (#575) +accounting/others/taxes/tax_included.rst accounting/taxation/taxes/tax_included.rst # others/* --> taxation/* (#575) +accounting/others/taxes/taxcloud.rst accounting/taxation/taxes/taxcloud.rst # others/* --> taxation/* (#575) accounting/payables/misc/employee_expense.rst expense/expense.rst # accounting/payables/misc/employee_expense --> expense/expense [merged] accounting/others/reporting/customize.rst accounting/reporting/overview/customize.rst # others/reporting/* --> reporting/overview/* accounting/others/reporting/main_reports.rst accounting/reporting/overview/main_reports.rst # others/reporting/* --> reporting/overview/* @@ -85,10 +85,20 @@ accounting/localizations/switzerland.rst accounting/fiscal_localizations/localiz accounting/payables/supplier_bills/bills_or_receipts.rst accounting/payables/supplier_bills/purchase_receipts.rst # bills_or_receipts.rst -> purchase_receipts.rst accounting/bank/reconciliation/configure.rst accounting/bank/reconciliation/reconciliation_models.rst # configure -> reconciliation_models (#613) accounting/receivables/customer_payments/credit_cards.rst accounting/receivables/customer_payments/online_payment.rst # credit_cards -> online_payment -accounting/fiscality/taxes/application.rst accounting/fiscality/taxes/fiscal_positions.rst # application -> fiscal_positions -accounting/fiscality/taxes/create.rst accounting/fiscality/taxes/taxes.rst # create -> taxes -accounting/fiscality/taxes/tax_included.rst accounting/fiscality/taxes/taxes.rst # tax_included -> taxes +accounting/fiscality/taxes/application.rst accounting/taxation/taxes/fiscal_positions.rst # fiscality/*/application -> taxation/*/fiscal_positions +accounting/fiscality/taxes/create.rst accounting/taxation/taxes/taxes.rst # fiscality/*/create -> taxation/*/taxes +accounting/fiscality/taxes/tax_included.rst accounting/taxation/taxes/taxes.rst # fiscality/*/tax_included -> taxation/*/taxes accounting/bank/misc/batch.rst accounting/receivables/customer_payments/batch.rst # bank/misc/* -> receivables/customer_payments/* +accounting/fiscality/fiscal_year/close_fiscal_year.rst accounting/taxation/fiscal_year/close_fiscal_year.rst # fiscality/* -> taxation/* +accounting/fiscality/fiscal_year/fiscal_year.rst accounting/taxation/fiscal_year/fiscal_year.rst # fiscality/* -> taxation/* +accounting/fiscality/taxes/B2B_B2C.rst accounting/taxation/taxes/B2B_B2C.rst # fiscality/* -> taxation/* +accounting/fiscality/taxes/cash_basis_taxes.rst accounting/taxation/taxes/cash_basis_taxes.rst # fiscality/* -> taxation/* +accounting/fiscality/taxes/default_taxes.rst accounting/taxation/taxes/default_taxes.rst # fiscality/* -> taxation/* +accounting/fiscality/taxes/fiscal_positions.rst accounting/taxation/taxes/fiscal_positions.rst # fiscality/* -> taxation/* +accounting/fiscality/taxes/retention.rst accounting/taxation/taxes/retention.rst # fiscality/* -> taxation/* +accounting/fiscality/taxes/taxcloud.rst accounting/taxation/taxes/taxcloud.rst # fiscality/* -> taxation/* +accounting/fiscality/taxes/taxes.rst accounting/taxation/taxes/taxes.rst # fiscality/* -> taxation/* +accounting/fiscality/taxes/vat_validation.rst accounting/taxation/taxes/vat_validation.rst # fiscality/* -> taxation/* social_marketing/social_marketing.rst social_marketing/overview.rst # social_marketing/* -> overview/* (#578) diff --git a/sales/products_prices/taxes.rst b/sales/products_prices/taxes.rst index 901808ea2..eadccc6f5 100644 --- a/sales/products_prices/taxes.rst +++ b/sales/products_prices/taxes.rst @@ -5,9 +5,9 @@ Set taxes .. toctree:: :titlesonly: - ../../accounting/fiscality/taxes/default_taxes - ../../accounting/fiscality/taxes/fiscal_positions - ../../accounting/fiscality/taxes/taxes - ../../accounting/fiscality/taxes/taxcloud - ../../accounting/fiscality/taxes/B2B_B2C + ../../accounting/taxation/taxes/default_taxes + ../../accounting/taxation/taxes/fiscal_positions + ../../accounting/taxation/taxes/taxes + ../../accounting/taxation/taxes/taxcloud + ../../accounting/taxation/taxes/B2B_B2C diff --git a/website/publish/on-premise_geo-ip-installation.rst b/website/publish/on-premise_geo-ip-installation.rst index 8dfc30ad8..edb481a22 100644 --- a/website/publish/on-premise_geo-ip-installation.rst +++ b/website/publish/on-premise_geo-ip-installation.rst @@ -1,18 +1,21 @@ -=========================================== -Geo IP installation (on-premises database) -=========================================== +========================================== +Geo IP Installation (On-Premises Database) +========================================== Installation ============ -.. warning:: Please note that the installation depends on your computer operating system and distribution. We will assume here that a Linux operating system is used. +.. warning:: + Please note that the installation depends on your computer's operating system and distribution. + We will assume that a Linux operating system is being used. #. Install `geoip2 `__ Python library .. code-block:: bash pip install geoip2 -#. Download the `GeoLite2 City database `_. You should end up with a file called ``GeoLite2-City.mmdb`` +#. Download the `GeoLite2 City database `_. You + should end up with a file called ``GeoLite2-City.mmdb`` #. Move the file to the folder ``/usr/share/GeoIP/`` .. code-block:: bash @@ -20,22 +23,26 @@ Installation #. Restart the server -.. note:: If you can't/don't want to locate the geoip database in ``/usr/share/GeoIP/``, you can use the ``--geoip-db`` option of the Odoo command line interface. - This option takes the absolute path to the GeoIP database file and will use it as the GeoIP database. - For example: +.. note:: + If you can't/don't want to locate the geoip database in ``/usr/share/GeoIP/``, you can use the + ``--geoip-db`` option of the Odoo command line interface. This option takes the absolute path to + the GeoIP database file and uses it as the GeoIP database. For example: - .. code-block:: bash + .. code-block:: bash - ./odoo-bin --geoip-db= ~/Downloads/GeoLite2-City.mmdb + ./odoo-bin --geoip-db= ~/Downloads/GeoLite2-City.mmdb - .. seealso:: - - `CLI documentation `_. + .. seealso:: + - `CLI documentation `_. -.. warning:: ``GeoIP`` Python library can also be used. However this version is discontinued since January 2019. See `GeoLite Legacy databases are now discontinued `_ +.. warning:: + ``GeoIP`` Python library can also be used. However this version is discontinued since January + 2019. See `GeoLite Legacy databases are now discontinued + `_ -How to test GeoIP geolocation in your Odoo website? -=================================================== -1. Go into your website. Open the web page on which you want to test ``GeoIP``. +How To Test GeoIP Geolocation In Your Odoo Website +================================================== +1. Go to your website. Open the web page that you want to test ``GeoIP``. 2. Choose :menuselection:`Customize --> HTML/CSS/JS Editor`. 3. Add the following piece of XML in the page : @@ -43,12 +50,13 @@ How to test GeoIP geolocation in your Odoo website?

-You should end up with a dictionary indicating the location of the ip address. +You should end up with a dictionary indicating the location of the IP address. .. image:: media/on-premise_geo-ip-installation01.png :align: center -.. note:: If the curly braces are empty ``{}``, it can be for any of the following reason : +.. note:: + If the curly braces are empty ``{}``, it can be for any of the following reasons : - The browsing IP address is the localhost (``127.0.0.1``) or a local area network one (``192.168.*.*``) - If a reversed proxy is used, make sure to configure it correctly. See `--proxy-mode `__