diff --git a/accounting.rst b/accounting.rst index 20236b480..bb11224e2 100644 --- a/accounting.rst +++ b/accounting.rst @@ -12,6 +12,6 @@ Accounting accounting/payables accounting/bank accounting/fiscality + accounting/reporting accounting/others - accounting/localizations - + accounting/localizations \ No newline at end of file diff --git a/accounting/fiscality/taxes.rst b/accounting/fiscality/taxes.rst index b5bbc249c..6be07a3b7 100644 --- a/accounting/fiscality/taxes.rst +++ b/accounting/fiscality/taxes.rst @@ -12,5 +12,4 @@ Taxes taxes/tax_included taxes/retention taxes/B2B_B2C - taxes/cash_basis_taxes - taxes/tax_returns \ No newline at end of file + taxes/cash_basis_taxes \ No newline at end of file diff --git a/accounting/others.rst b/accounting/others.rst index 55f564f98..2ade64341 100644 --- a/accounting/others.rst +++ b/accounting/others.rst @@ -8,5 +8,4 @@ Others others/analytic others/adviser others/multicurrencies - others/reporting others/inventory \ No newline at end of file diff --git a/accounting/others/reporting.rst b/accounting/reporting.rst similarity index 57% rename from accounting/others/reporting.rst rename to accounting/reporting.rst index ab93506c8..fc464eb14 100644 --- a/accounting/others/reporting.rst +++ b/accounting/reporting.rst @@ -5,5 +5,5 @@ Reporting .. toctree:: :titlesonly: - reporting/main_reports - reporting/customize \ No newline at end of file + reporting/overview + reporting/declarations \ No newline at end of file diff --git a/accounting/reporting/declarations.rst b/accounting/reporting/declarations.rst new file mode 100644 index 000000000..4aabeb952 --- /dev/null +++ b/accounting/reporting/declarations.rst @@ -0,0 +1,8 @@ +============ +Declarations +============ + +.. toctree:: + :titlesonly: + + declarations/tax_returns \ No newline at end of file diff --git a/accounting/fiscality/taxes/media/tax_return_closing.png b/accounting/reporting/declarations/media/tax_return_closing.png similarity index 100% rename from accounting/fiscality/taxes/media/tax_return_closing.png rename to accounting/reporting/declarations/media/tax_return_closing.png diff --git a/accounting/fiscality/taxes/media/tax_return_grids.png b/accounting/reporting/declarations/media/tax_return_grids.png similarity index 100% rename from accounting/fiscality/taxes/media/tax_return_grids.png rename to accounting/reporting/declarations/media/tax_return_grids.png diff --git a/accounting/fiscality/taxes/media/tax_return_lock.png b/accounting/reporting/declarations/media/tax_return_lock.png similarity index 100% rename from accounting/fiscality/taxes/media/tax_return_lock.png rename to accounting/reporting/declarations/media/tax_return_lock.png diff --git a/accounting/fiscality/taxes/media/tax_return_overview.png b/accounting/reporting/declarations/media/tax_return_overview.png similarity index 100% rename from accounting/fiscality/taxes/media/tax_return_overview.png rename to accounting/reporting/declarations/media/tax_return_overview.png diff --git a/accounting/fiscality/taxes/media/tax_return_periodicity.png b/accounting/reporting/declarations/media/tax_return_periodicity.png similarity index 100% rename from accounting/fiscality/taxes/media/tax_return_periodicity.png rename to accounting/reporting/declarations/media/tax_return_periodicity.png diff --git a/accounting/fiscality/taxes/media/tax_return_report.png b/accounting/reporting/declarations/media/tax_return_report.png similarity index 100% rename from accounting/fiscality/taxes/media/tax_return_report.png rename to accounting/reporting/declarations/media/tax_return_report.png diff --git a/accounting/fiscality/taxes/media/tax_return_taxes.png b/accounting/reporting/declarations/media/tax_return_taxes.png similarity index 100% rename from accounting/fiscality/taxes/media/tax_return_taxes.png rename to accounting/reporting/declarations/media/tax_return_taxes.png diff --git a/accounting/fiscality/taxes/tax_returns.rst b/accounting/reporting/declarations/tax_returns.rst similarity index 99% rename from accounting/fiscality/taxes/tax_returns.rst rename to accounting/reporting/declarations/tax_returns.rst index 47588ec8c..a02581aca 100644 --- a/accounting/fiscality/taxes/tax_returns.rst +++ b/accounting/reporting/declarations/tax_returns.rst @@ -118,5 +118,5 @@ with the amount you have to pay or be refunded. above. .. seealso:: - * :doc:`create` + * :doc:`../../fiscality/taxes/create` * :doc:`../../overview/getting_started/setup` \ No newline at end of file diff --git a/accounting/reporting/overview.rst b/accounting/reporting/overview.rst new file mode 100644 index 000000000..8c2de9e49 --- /dev/null +++ b/accounting/reporting/overview.rst @@ -0,0 +1,9 @@ +======== +Overview +======== + +.. toctree:: + :titlesonly: + + overview/main_reports + overview/customize \ No newline at end of file diff --git a/accounting/others/reporting/customize.rst b/accounting/reporting/overview/customize.rst similarity index 100% rename from accounting/others/reporting/customize.rst rename to accounting/reporting/overview/customize.rst diff --git a/accounting/others/reporting/main_reports.rst b/accounting/reporting/overview/main_reports.rst similarity index 100% rename from accounting/others/reporting/main_reports.rst rename to accounting/reporting/overview/main_reports.rst diff --git a/accounting/others/reporting/media/customize02.png b/accounting/reporting/overview/media/customize02.png similarity index 100% rename from accounting/others/reporting/media/customize02.png rename to accounting/reporting/overview/media/customize02.png diff --git a/accounting/others/reporting/media/customize04.png b/accounting/reporting/overview/media/customize04.png similarity index 100% rename from accounting/others/reporting/media/customize04.png rename to accounting/reporting/overview/media/customize04.png diff --git a/accounting/others/reporting/media/main_reports01.png b/accounting/reporting/overview/media/main_reports01.png similarity index 100% rename from accounting/others/reporting/media/main_reports01.png rename to accounting/reporting/overview/media/main_reports01.png diff --git a/accounting/others/reporting/media/main_reports02.png b/accounting/reporting/overview/media/main_reports02.png similarity index 100% rename from accounting/others/reporting/media/main_reports02.png rename to accounting/reporting/overview/media/main_reports02.png diff --git a/accounting/others/reporting/media/main_reports03.png b/accounting/reporting/overview/media/main_reports03.png similarity index 100% rename from accounting/others/reporting/media/main_reports03.png rename to accounting/reporting/overview/media/main_reports03.png diff --git a/accounting/others/reporting/media/main_reports04.png b/accounting/reporting/overview/media/main_reports04.png similarity index 100% rename from accounting/others/reporting/media/main_reports04.png rename to accounting/reporting/overview/media/main_reports04.png diff --git a/accounting/others/reporting/media/main_reports05.png b/accounting/reporting/overview/media/main_reports05.png similarity index 100% rename from accounting/others/reporting/media/main_reports05.png rename to accounting/reporting/overview/media/main_reports05.png diff --git a/accounting/others/reporting/media/main_reports06.png b/accounting/reporting/overview/media/main_reports06.png similarity index 100% rename from accounting/others/reporting/media/main_reports06.png rename to accounting/reporting/overview/media/main_reports06.png diff --git a/accounting/others/reporting/media/main_reports07.png b/accounting/reporting/overview/media/main_reports07.png similarity index 100% rename from accounting/others/reporting/media/main_reports07.png rename to accounting/reporting/overview/media/main_reports07.png diff --git a/accounting/others/reporting/media/main_reports08.png b/accounting/reporting/overview/media/main_reports08.png similarity index 100% rename from accounting/others/reporting/media/main_reports08.png rename to accounting/reporting/overview/media/main_reports08.png diff --git a/accounting/others/reporting/media/main_reports09.png b/accounting/reporting/overview/media/main_reports09.png similarity index 100% rename from accounting/others/reporting/media/main_reports09.png rename to accounting/reporting/overview/media/main_reports09.png diff --git a/accounting/others/reporting/media/main_reports10.png b/accounting/reporting/overview/media/main_reports10.png similarity index 100% rename from accounting/others/reporting/media/main_reports10.png rename to accounting/reporting/overview/media/main_reports10.png diff --git a/redirects.txt b/redirects.txt index 6e41245c6..a8a55db61 100644 --- a/redirects.txt +++ b/redirects.txt @@ -66,6 +66,9 @@ accounting/others/taxes/retention.rst accounting/fiscality/taxes/retention.rst 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/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/* +accounting/fiscality/taxes/tax_returns.rst accounting/reporting/declarations/tax_returns.rst # fiscality/taxes/* --> reporting/declarations/* social_marketing/social_marketing.rst social_marketing/overview.rst # social_marketing/* -> overview/* (#578)