From e7825033bcd519b05258fccdb9cd5d1064c9a1ab Mon Sep 17 00:00:00 2001 From: tas-odoo <73958238+tas-odoo@users.noreply.github.com> Date: Sat, 20 Mar 2021 15:11:20 -0700 Subject: [PATCH 1/5] [FIX] contributing: fix a little typo --- contributing/documentation/introduction_guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributing/documentation/introduction_guide.rst b/contributing/documentation/introduction_guide.rst index 2e871866f..4ec328f1a 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: From 25e7dedf47c5099c70cba3369520925f4ec18b92 Mon Sep 17 00:00:00 2001 From: Jonathan <46810843+jcs-odoo@users.noreply.github.com> Date: Fri, 26 Mar 2021 22:50:01 +0100 Subject: [PATCH 2/5] [IMP] accounting: change the section name "fiscality" into "taxation" (#920) - the section is renamed - the folder's name is renamed - all references to documents in that section are updated - previous redirections (redirects.txt) are fixed and new ones are added --- accounting.rst | 2 +- .../overview/fiscal_localization_packages.rst | 2 +- accounting/fiscality.rst | 9 ----- .../reporting/declarations/tax_returns.rst | 2 +- accounting/taxation.rst | 9 +++++ .../{fiscality => taxation}/fiscal_year.rst | 0 .../fiscal_year/close_fiscal_year.rst | 0 .../fiscal_year/fiscal_year.rst | 0 .../fiscal_year/media/close_fiscal_year01.png | Bin .../fiscal_year/media/fiscal_year01.png | Bin .../fiscal_year/media/fiscal_year02.png | Bin .../fiscal_year/media/fiscal_year03.png | Bin accounting/{fiscality => taxation}/taxes.rst | 0 .../{fiscality => taxation}/taxes/B2B_B2C.rst | 0 .../taxes/cash_basis_taxes.rst | 0 .../taxes/default_taxes.rst | 0 .../taxes/fiscal_positions.rst | 0 .../taxes/media/cash_basis_taxes01.png | Bin .../taxes/media/cash_basis_taxes02.png | Bin .../taxes/media/cash_basis_taxes03.png | Bin .../taxes/media/create01.png | Bin .../taxes/media/create02.png | Bin .../media/default-taxes-configuration.png | Bin .../media/default-taxes-invoice-line.png | Bin .../media/fiscal-positions-automatic.png | Bin .../fiscal-positions-intra-community.png | Bin .../taxes/media/fiscal-positions-partner.png | Bin .../media/fiscal-positions-transaction.png | Bin .../taxes/media/price_B2C_B2B01.png | Bin .../taxes/media/price_B2C_B2B02.png | Bin .../taxes/media/price_B2C_B2B03.png | Bin .../taxes/media/price_B2C_B2B04.png | Bin .../taxes/media/price_B2C_B2B05.png | Bin .../taxes/media/retention01.png | Bin .../taxes/media/retention02.png | Bin .../taxes/media/retention03.png | Bin .../taxes/media/retention04.png | Bin .../taxes/media/taxcloud01.png | Bin .../taxes/media/taxcloud02.png | Bin .../taxes/media/taxcloud03.png | Bin .../taxes/media/taxcloud04.png | Bin .../taxes/media/taxes-definition.png | Bin .../taxes/media/taxes-edit.png | Bin .../taxes/media/taxes-invoice-label.png | Bin .../taxes/media/taxes-invoice-tax-group.png | Bin .../taxes/media/taxes-list-sequence.png | Bin .../taxes/media/taxes-list.png | Bin .../taxes/media/taxes-subsequent-line.png | Bin .../media/vat-validation-configuration.png | Bin .../media/vat-validation-contact-form.png | Bin .../taxes/media/vat-validation-error.png | Bin .../taxes/retention.rst | 0 .../taxes/taxcloud.rst | 0 .../{fiscality => taxation}/taxes/taxes.rst | 0 .../taxes/vat_validation.rst | 0 ecommerce/taxes.rst | 8 ++-- .../manage_multi_companies.rst | 4 +- redirects.txt | 38 +++++++++++------- sales/products_prices/taxes.rst | 10 ++--- 59 files changed, 47 insertions(+), 37 deletions(-) delete mode 100644 accounting/fiscality.rst create mode 100644 accounting/taxation.rst rename accounting/{fiscality => taxation}/fiscal_year.rst (100%) rename accounting/{fiscality => taxation}/fiscal_year/close_fiscal_year.rst (100%) rename accounting/{fiscality => taxation}/fiscal_year/fiscal_year.rst (100%) rename accounting/{fiscality => taxation}/fiscal_year/media/close_fiscal_year01.png (100%) rename accounting/{fiscality => taxation}/fiscal_year/media/fiscal_year01.png (100%) rename accounting/{fiscality => taxation}/fiscal_year/media/fiscal_year02.png (100%) rename accounting/{fiscality => taxation}/fiscal_year/media/fiscal_year03.png (100%) rename accounting/{fiscality => taxation}/taxes.rst (100%) rename accounting/{fiscality => taxation}/taxes/B2B_B2C.rst (100%) rename accounting/{fiscality => taxation}/taxes/cash_basis_taxes.rst (100%) rename accounting/{fiscality => taxation}/taxes/default_taxes.rst (100%) rename accounting/{fiscality => taxation}/taxes/fiscal_positions.rst (100%) rename accounting/{fiscality => taxation}/taxes/media/cash_basis_taxes01.png (100%) rename accounting/{fiscality => taxation}/taxes/media/cash_basis_taxes02.png (100%) rename accounting/{fiscality => taxation}/taxes/media/cash_basis_taxes03.png (100%) rename accounting/{fiscality => taxation}/taxes/media/create01.png (100%) rename accounting/{fiscality => taxation}/taxes/media/create02.png (100%) rename accounting/{fiscality => taxation}/taxes/media/default-taxes-configuration.png (100%) rename accounting/{fiscality => taxation}/taxes/media/default-taxes-invoice-line.png (100%) rename accounting/{fiscality => taxation}/taxes/media/fiscal-positions-automatic.png (100%) rename accounting/{fiscality => taxation}/taxes/media/fiscal-positions-intra-community.png (100%) rename accounting/{fiscality => taxation}/taxes/media/fiscal-positions-partner.png (100%) rename accounting/{fiscality => taxation}/taxes/media/fiscal-positions-transaction.png (100%) rename accounting/{fiscality => taxation}/taxes/media/price_B2C_B2B01.png (100%) rename accounting/{fiscality => taxation}/taxes/media/price_B2C_B2B02.png (100%) rename accounting/{fiscality => taxation}/taxes/media/price_B2C_B2B03.png (100%) rename accounting/{fiscality => taxation}/taxes/media/price_B2C_B2B04.png (100%) rename accounting/{fiscality => taxation}/taxes/media/price_B2C_B2B05.png (100%) rename accounting/{fiscality => taxation}/taxes/media/retention01.png (100%) rename accounting/{fiscality => taxation}/taxes/media/retention02.png (100%) rename accounting/{fiscality => taxation}/taxes/media/retention03.png (100%) rename accounting/{fiscality => taxation}/taxes/media/retention04.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxcloud01.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxcloud02.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxcloud03.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxcloud04.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxes-definition.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxes-edit.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxes-invoice-label.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxes-invoice-tax-group.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxes-list-sequence.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxes-list.png (100%) rename accounting/{fiscality => taxation}/taxes/media/taxes-subsequent-line.png (100%) rename accounting/{fiscality => taxation}/taxes/media/vat-validation-configuration.png (100%) rename accounting/{fiscality => taxation}/taxes/media/vat-validation-contact-form.png (100%) rename accounting/{fiscality => taxation}/taxes/media/vat-validation-error.png (100%) rename accounting/{fiscality => taxation}/taxes/retention.rst (100%) rename accounting/{fiscality => taxation}/taxes/taxcloud.rst (100%) rename accounting/{fiscality => taxation}/taxes/taxes.rst (100%) rename accounting/{fiscality => taxation}/taxes/vat_validation.rst (100%) 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/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 7fdb536a2..b70d36ea7 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/redirects.txt b/redirects.txt index f3178c743..b853c5e9a 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 From 901d5f1882ba30519f32ed14a50f01a87b6e4812 Mon Sep 17 00:00:00 2001 From: Odoo Translation Bot Date: Sun, 28 Mar 2021 01:30:37 +0100 Subject: [PATCH 3/5] [I18N] Update translation terms from Transifex --- locale/es/LC_MESSAGES/accounting.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/locale/es/LC_MESSAGES/accounting.po b/locale/es/LC_MESSAGES/accounting.po index ff1e7eedf..5d92d5edb 100644 --- a/locale/es/LC_MESSAGES/accounting.po +++ b/locale/es/LC_MESSAGES/accounting.po @@ -61,6 +61,7 @@ # renodoo , 2021 # Wilson Pujols , 2021 # Valentino , 2021 +# Gabriela Enriquez Manzano , 2021 # #, fuzzy msgid "" @@ -69,7 +70,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-02-04 12:07+0100\n" "PO-Revision-Date: 2019-10-03 09:45+0000\n" -"Last-Translator: Valentino , 2021\n" +"Last-Translator: Gabriela Enriquez Manzano , 2021\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7488,6 +7489,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:472 msgid "" From 5c654daf6191353cab0233ddedabb87440ea6be2 Mon Sep 17 00:00:00 2001 From: "KC (ksc)" Date: Wed, 24 Mar 2021 12:09:53 -0700 Subject: [PATCH 4/5] [IMP] ecommerce: fixes grammatical errors --- .../on-premise_geo-ip-installation.rst | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/website/publish/on-premise_geo-ip-installation.rst b/website/publish/on-premise_geo-ip-installation.rst index 87dcbb06d..ce4bd85c3 100644 --- a/website/publish/on-premise_geo-ip-installation.rst +++ b/website/publish/on-premise_geo-ip-installation.rst @@ -1,18 +1,20 @@ -=========================================== -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,8 +22,10 @@ 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. +.. 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 @@ -31,11 +35,13 @@ Installation .. 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 +49,12 @@ 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 `__ From ba66fc62147ff5c43a49659a0daa6da12d410dcf Mon Sep 17 00:00:00 2001 From: "Antoine Vandevenne (anv)" Date: Thu, 1 Apr 2021 10:45:24 +0200 Subject: [PATCH 5/5] [FIX] ecommerce: fix broken link --- .../on-premise_geo-ip-installation.rst | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/website/publish/on-premise_geo-ip-installation.rst b/website/publish/on-premise_geo-ip-installation.rst index ce4bd85c3..90af5cbca 100644 --- a/website/publish/on-premise_geo-ip-installation.rst +++ b/website/publish/on-premise_geo-ip-installation.rst @@ -5,8 +5,9 @@ Geo IP Installation (On-Premises Database) Installation ============ -.. 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. +.. 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 @@ -22,22 +23,22 @@ 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 uses 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 ================================================== @@ -54,7 +55,8 @@ 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 reasons : +.. 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 `__