diff --git a/accounting.rst b/accounting.rst index cd202e9e8..20236b480 100644 --- a/accounting.rst +++ b/accounting.rst @@ -11,6 +11,7 @@ Accounting accounting/receivables accounting/payables accounting/bank + accounting/fiscality accounting/others accounting/localizations diff --git a/accounting/fiscality.rst b/accounting/fiscality.rst new file mode 100644 index 000000000..b3b325b0e --- /dev/null +++ b/accounting/fiscality.rst @@ -0,0 +1,9 @@ +========= +Fiscality +========= + +.. toctree:: + :titlesonly: + + fiscality/taxes + fiscality/fiscal_year \ No newline at end of file diff --git a/accounting/fiscality/fiscal_year.rst b/accounting/fiscality/fiscal_year.rst new file mode 100644 index 000000000..fbf4b0567 --- /dev/null +++ b/accounting/fiscality/fiscal_year.rst @@ -0,0 +1,9 @@ +=========== +Fiscal Year +=========== + +.. toctree:: + :titlesonly: + + fiscal_year/fiscal_year + fiscal_year/close_fiscal_year \ No newline at end of file diff --git a/accounting/others/adviser/fiscalyear.rst b/accounting/fiscality/fiscal_year/close_fiscal_year.rst similarity index 97% rename from accounting/others/adviser/fiscalyear.rst rename to accounting/fiscality/fiscal_year/close_fiscal_year.rst index 7f19b8317..3f86b68da 100644 --- a/accounting/others/adviser/fiscalyear.rst +++ b/accounting/fiscality/fiscal_year/close_fiscal_year.rst @@ -70,7 +70,7 @@ set under the accounting configuration. This way, the accountant can be confident that nobody is changing the previous year transactions while auditing the books. -.. image:: media/fiscalyear01.png +.. image:: media/close_fiscal_year01.png :align: center Closing the fiscal year @@ -90,4 +90,4 @@ whether or not the current year earnings in the **Balance Sheet** is correctly reporting a 0 balance. .. seealso:: - * :doc:`../configuration/fiscal_year` \ No newline at end of file + * :doc:`fiscal_year` \ No newline at end of file diff --git a/accounting/others/configuration/fiscal_year.rst b/accounting/fiscality/fiscal_year/fiscal_year.rst similarity index 96% rename from accounting/others/configuration/fiscal_year.rst rename to accounting/fiscality/fiscal_year/fiscal_year.rst index e7f9522c6..37ef04bff 100644 --- a/accounting/others/configuration/fiscal_year.rst +++ b/accounting/fiscality/fiscal_year/fiscal_year.rst @@ -31,4 +31,4 @@ You can then configure your fiscal years in .. seealso:: - * :doc:`../adviser/fiscalyear` + * :doc:`close_fiscal_year` diff --git a/accounting/others/adviser/media/fiscalyear01.png b/accounting/fiscality/fiscal_year/media/close_fiscal_year01.png similarity index 100% rename from accounting/others/adviser/media/fiscalyear01.png rename to accounting/fiscality/fiscal_year/media/close_fiscal_year01.png diff --git a/accounting/others/configuration/media/fiscal_year01.png b/accounting/fiscality/fiscal_year/media/fiscal_year01.png similarity index 100% rename from accounting/others/configuration/media/fiscal_year01.png rename to accounting/fiscality/fiscal_year/media/fiscal_year01.png diff --git a/accounting/others/configuration/media/fiscal_year02.png b/accounting/fiscality/fiscal_year/media/fiscal_year02.png similarity index 100% rename from accounting/others/configuration/media/fiscal_year02.png rename to accounting/fiscality/fiscal_year/media/fiscal_year02.png diff --git a/accounting/others/configuration/media/fiscal_year03.png b/accounting/fiscality/fiscal_year/media/fiscal_year03.png similarity index 100% rename from accounting/others/configuration/media/fiscal_year03.png rename to accounting/fiscality/fiscal_year/media/fiscal_year03.png diff --git a/accounting/others/taxes.rst b/accounting/fiscality/taxes.rst similarity index 100% rename from accounting/others/taxes.rst rename to accounting/fiscality/taxes.rst diff --git a/accounting/others/taxes/B2B_B2C.rst b/accounting/fiscality/taxes/B2B_B2C.rst similarity index 100% rename from accounting/others/taxes/B2B_B2C.rst rename to accounting/fiscality/taxes/B2B_B2C.rst diff --git a/accounting/others/taxes/application.rst b/accounting/fiscality/taxes/application.rst similarity index 100% rename from accounting/others/taxes/application.rst rename to accounting/fiscality/taxes/application.rst diff --git a/accounting/others/taxes/cash_basis_taxes.rst b/accounting/fiscality/taxes/cash_basis_taxes.rst similarity index 100% rename from accounting/others/taxes/cash_basis_taxes.rst rename to accounting/fiscality/taxes/cash_basis_taxes.rst diff --git a/accounting/others/taxes/create.rst b/accounting/fiscality/taxes/create.rst similarity index 100% rename from accounting/others/taxes/create.rst rename to accounting/fiscality/taxes/create.rst diff --git a/accounting/others/taxes/default_taxes.rst b/accounting/fiscality/taxes/default_taxes.rst similarity index 100% rename from accounting/others/taxes/default_taxes.rst rename to accounting/fiscality/taxes/default_taxes.rst diff --git a/accounting/others/taxes/media/application01.png b/accounting/fiscality/taxes/media/application01.png similarity index 100% rename from accounting/others/taxes/media/application01.png rename to accounting/fiscality/taxes/media/application01.png diff --git a/accounting/others/taxes/media/application02.png b/accounting/fiscality/taxes/media/application02.png similarity index 100% rename from accounting/others/taxes/media/application02.png rename to accounting/fiscality/taxes/media/application02.png diff --git a/accounting/others/taxes/media/application03.png b/accounting/fiscality/taxes/media/application03.png similarity index 100% rename from accounting/others/taxes/media/application03.png rename to accounting/fiscality/taxes/media/application03.png diff --git a/accounting/others/taxes/media/application04.png b/accounting/fiscality/taxes/media/application04.png similarity index 100% rename from accounting/others/taxes/media/application04.png rename to accounting/fiscality/taxes/media/application04.png diff --git a/accounting/others/taxes/media/application05.png b/accounting/fiscality/taxes/media/application05.png similarity index 100% rename from accounting/others/taxes/media/application05.png rename to accounting/fiscality/taxes/media/application05.png diff --git a/accounting/others/taxes/media/cash_basis_taxes01.png b/accounting/fiscality/taxes/media/cash_basis_taxes01.png similarity index 100% rename from accounting/others/taxes/media/cash_basis_taxes01.png rename to accounting/fiscality/taxes/media/cash_basis_taxes01.png diff --git a/accounting/others/taxes/media/cash_basis_taxes02.png b/accounting/fiscality/taxes/media/cash_basis_taxes02.png similarity index 100% rename from accounting/others/taxes/media/cash_basis_taxes02.png rename to accounting/fiscality/taxes/media/cash_basis_taxes02.png diff --git a/accounting/others/taxes/media/cash_basis_taxes03.png b/accounting/fiscality/taxes/media/cash_basis_taxes03.png similarity index 100% rename from accounting/others/taxes/media/cash_basis_taxes03.png rename to accounting/fiscality/taxes/media/cash_basis_taxes03.png diff --git a/accounting/others/taxes/media/create01.png b/accounting/fiscality/taxes/media/create01.png similarity index 100% rename from accounting/others/taxes/media/create01.png rename to accounting/fiscality/taxes/media/create01.png diff --git a/accounting/others/taxes/media/create02.png b/accounting/fiscality/taxes/media/create02.png similarity index 100% rename from accounting/others/taxes/media/create02.png rename to accounting/fiscality/taxes/media/create02.png diff --git a/accounting/others/taxes/media/create04.png b/accounting/fiscality/taxes/media/create04.png similarity index 100% rename from accounting/others/taxes/media/create04.png rename to accounting/fiscality/taxes/media/create04.png diff --git a/accounting/others/taxes/media/price_B2C_B2B01.png b/accounting/fiscality/taxes/media/price_B2C_B2B01.png similarity index 100% rename from accounting/others/taxes/media/price_B2C_B2B01.png rename to accounting/fiscality/taxes/media/price_B2C_B2B01.png diff --git a/accounting/others/taxes/media/price_B2C_B2B02.png b/accounting/fiscality/taxes/media/price_B2C_B2B02.png similarity index 100% rename from accounting/others/taxes/media/price_B2C_B2B02.png rename to accounting/fiscality/taxes/media/price_B2C_B2B02.png diff --git a/accounting/others/taxes/media/price_B2C_B2B03.png b/accounting/fiscality/taxes/media/price_B2C_B2B03.png similarity index 100% rename from accounting/others/taxes/media/price_B2C_B2B03.png rename to accounting/fiscality/taxes/media/price_B2C_B2B03.png diff --git a/accounting/others/taxes/media/price_B2C_B2B04.png b/accounting/fiscality/taxes/media/price_B2C_B2B04.png similarity index 100% rename from accounting/others/taxes/media/price_B2C_B2B04.png rename to accounting/fiscality/taxes/media/price_B2C_B2B04.png diff --git a/accounting/others/taxes/media/price_B2C_B2B05.png b/accounting/fiscality/taxes/media/price_B2C_B2B05.png similarity index 100% rename from accounting/others/taxes/media/price_B2C_B2B05.png rename to accounting/fiscality/taxes/media/price_B2C_B2B05.png diff --git a/accounting/others/taxes/media/retention01.png b/accounting/fiscality/taxes/media/retention01.png similarity index 100% rename from accounting/others/taxes/media/retention01.png rename to accounting/fiscality/taxes/media/retention01.png diff --git a/accounting/others/taxes/media/retention02.png b/accounting/fiscality/taxes/media/retention02.png similarity index 100% rename from accounting/others/taxes/media/retention02.png rename to accounting/fiscality/taxes/media/retention02.png diff --git a/accounting/others/taxes/media/retention03.png b/accounting/fiscality/taxes/media/retention03.png similarity index 100% rename from accounting/others/taxes/media/retention03.png rename to accounting/fiscality/taxes/media/retention03.png diff --git a/accounting/others/taxes/media/retention04.png b/accounting/fiscality/taxes/media/retention04.png similarity index 100% rename from accounting/others/taxes/media/retention04.png rename to accounting/fiscality/taxes/media/retention04.png diff --git a/accounting/others/taxes/media/tax_included.png b/accounting/fiscality/taxes/media/tax_included.png similarity index 100% rename from accounting/others/taxes/media/tax_included.png rename to accounting/fiscality/taxes/media/tax_included.png diff --git a/accounting/others/taxes/media/taxcloud01.png b/accounting/fiscality/taxes/media/taxcloud01.png similarity index 100% rename from accounting/others/taxes/media/taxcloud01.png rename to accounting/fiscality/taxes/media/taxcloud01.png diff --git a/accounting/others/taxes/media/taxcloud02.png b/accounting/fiscality/taxes/media/taxcloud02.png similarity index 100% rename from accounting/others/taxes/media/taxcloud02.png rename to accounting/fiscality/taxes/media/taxcloud02.png diff --git a/accounting/others/taxes/media/taxcloud03.png b/accounting/fiscality/taxes/media/taxcloud03.png similarity index 100% rename from accounting/others/taxes/media/taxcloud03.png rename to accounting/fiscality/taxes/media/taxcloud03.png diff --git a/accounting/others/taxes/media/taxcloud04.png b/accounting/fiscality/taxes/media/taxcloud04.png similarity index 100% rename from accounting/others/taxes/media/taxcloud04.png rename to accounting/fiscality/taxes/media/taxcloud04.png diff --git a/accounting/others/taxes/retention.rst b/accounting/fiscality/taxes/retention.rst similarity index 100% rename from accounting/others/taxes/retention.rst rename to accounting/fiscality/taxes/retention.rst diff --git a/accounting/others/taxes/tax_included.rst b/accounting/fiscality/taxes/tax_included.rst similarity index 100% rename from accounting/others/taxes/tax_included.rst rename to accounting/fiscality/taxes/tax_included.rst diff --git a/accounting/others/taxes/taxcloud.rst b/accounting/fiscality/taxes/taxcloud.rst similarity index 100% rename from accounting/others/taxes/taxcloud.rst rename to accounting/fiscality/taxes/taxcloud.rst diff --git a/accounting/others.rst b/accounting/others.rst index 992a78014..2a4ec0220 100644 --- a/accounting/others.rst +++ b/accounting/others.rst @@ -5,9 +5,7 @@ Others .. toctree:: :titlesonly: - others/configuration others/analytic - others/taxes others/adviser others/multicurrencies others/reporting diff --git a/accounting/others/adviser.rst b/accounting/others/adviser.rst index 0ae2990c2..1155807f6 100644 --- a/accounting/others/adviser.rst +++ b/accounting/others/adviser.rst @@ -5,6 +5,5 @@ Adviser .. toctree:: :titlesonly: - adviser/fiscalyear adviser/budget adviser/reverse_entry diff --git a/accounting/others/configuration.rst b/accounting/others/configuration.rst deleted file mode 100644 index 68552df21..000000000 --- a/accounting/others/configuration.rst +++ /dev/null @@ -1,8 +0,0 @@ -============= -Configuration -============= - -.. toctree:: - :titlesonly: - - configuration/fiscal_year diff --git a/ecommerce/taxes.rst b/ecommerce/taxes.rst index 9800785b3..2a1ee1526 100644 --- a/ecommerce/taxes.rst +++ b/ecommerce/taxes.rst @@ -5,8 +5,8 @@ Collect taxes .. toctree:: :titlesonly: - ../../accounting/others/taxes/default_taxes - ../../accounting/others/taxes/application - ../../accounting/others/taxes/tax_included - ../../accounting/others/taxes/taxcloud + ../../accounting/fiscality/taxes/default_taxes + ../../accounting/fiscality/taxes/application + ../../accounting/fiscality/taxes/tax_included + ../../accounting/fiscality/taxes/taxcloud diff --git a/expense/expense.rst b/expense/expense.rst index 1505744ad..4a299666e 100644 --- a/expense/expense.rst +++ b/expense/expense.rst @@ -33,7 +33,7 @@ Here are some examples to configure: Don't forget to set an expense tax on each expense type (and an account if you use Odoo Accounting). It's usually a good practice to use a tax that is configured -with *Tax Included in Price* (see: :doc:`../accounting/others/taxes/tax_included`). +with *Tax Included in Price* (see: :doc:`../accounting/fiscality/taxes/tax_included`). That way, employees report expenses with prices including taxes, which is usually the expected behaviour. diff --git a/sales/products_prices/taxes.rst b/sales/products_prices/taxes.rst index a5928ff2d..dea583896 100644 --- a/sales/products_prices/taxes.rst +++ b/sales/products_prices/taxes.rst @@ -5,9 +5,9 @@ Set taxes .. toctree:: :titlesonly: - ../../accounting/others/taxes/default_taxes - ../../accounting/others/taxes/application - ../../accounting/others/taxes/tax_included - ../../accounting/others/taxes/taxcloud - ../../accounting/others/taxes/B2B_B2C + ../../accounting/fiscality/taxes/default_taxes + ../../accounting/fiscality/taxes/application + ../../accounting/fiscality/taxes/tax_included + ../../accounting/fiscality/taxes/taxcloud + ../../accounting/fiscality/taxes/B2B_B2C