[FW][MOV] accounting: restructuration of the accounting documentation

[fw-bot]

Forward-Port-Of: #4422

[robodoo]

Pull request status dashboard.

[fw-bot]

@jcs-odoo cherrypicking of pull request #4422 failed.

stdout:

Auto-merging content/applications/finance/accounting/bank.rst
Auto-merging content/applications/finance/accounting/bank/reconciliation.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/bank/reconciliation.rst
CONFLICT (rename/delete): content/applications/finance/accounting/bank/reconciliation/cash_transactions.rst renamed to content/applications/finance/accounting/bank/reconciliation_cash.rst in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (modify/delete): content/applications/finance/accounting/bank/reconciliation_cash.rst deleted in HEAD and modified in 9614a852d ([MOV] accounting: restructuration of the accounting documentation).  Version 9614a852d ([MOV] accounting: restructuration of the accounting documentation) of content/applications/finance/accounting/bank/reconciliation_cash.rst left in tree.
CONFLICT (rename/delete): content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-inpayment-status.png renamed to content/applications/finance/accounting/bank/reconciliation_cash/cash-inpayment-status.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-payment-journal.png renamed to content/applications/finance/accounting/bank/reconciliation_cash/cash-payment-journal.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-payment-reconciliation.png renamed to content/applications/finance/accounting/bank/reconciliation_cash/cash-payment-reconciliation.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/bank/reconciliation/cash_transactions/cash-payments-config.png renamed to content/applications/finance/accounting/bank/reconciliation_cash/cash-payments-config.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/bank/reconciliation/cash_transactions/new-transaction.png renamed to content/applications/finance/accounting/bank/reconciliation_cash/new-transaction.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
Auto-merging content/applications/finance/accounting/bank/reconciliation_models.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/bank/reconciliation_models.rst
CONFLICT (modify/delete): content/applications/finance/accounting/bank/setup.rst deleted in 9614a852d ([MOV] accounting: restructuration of the accounting documentation) and modified in HEAD.  Version HEAD of content/applications/finance/accounting/bank/setup.rst left in tree.
CONFLICT (modify/delete): content/applications/finance/accounting/bank/setup/bank_accounts.rst deleted in 9614a852d ([MOV] accounting: restructuration of the accounting documentation) and modified in HEAD.  Version HEAD of content/applications/finance/accounting/bank/setup/bank_accounts.rst left in tree.
Auto-merging content/applications/finance/accounting/customer_invoices/cash_discounts.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/customer_invoices/cash_discounts.rst
CONFLICT (rename/delete): content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts01.png renamed to content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts01.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts02.png renamed to content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts02.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts03.png renamed to content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts03.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/cash_discounts04.png renamed to content/applications/finance/accounting/customer_invoices/cash_discounts/cash_discounts04.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/invoice-journal-entry.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/customer_invoices/cash_discounts/invoice-journal-entry.png.
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/invoice-print.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/customer_invoices/cash_discounts/invoice-print.png.
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_invoices/cash_discounts/payment-terms.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/customer_invoices/cash_discounts/payment-terms.png.
Auto-merging content/applications/finance/accounting/customer_invoices/overview.rst
Auto-merging content/applications/finance/accounting/get_started.rst
CONFLICT (modify/delete): content/applications/finance/accounting/others.rst deleted in 9614a852d ([MOV] accounting: restructuration of the accounting documentation) and modified in HEAD.  Version HEAD of content/applications/finance/accounting/others.rst left in tree.
Auto-merging content/applications/finance/accounting/payments.rst
Auto-merging content/applications/finance/accounting/payments/batch.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/payments/batch.rst
CONFLICT (rename/delete): content/applications/finance/accounting/receivables/customer_payments/batch/batch-bank-reconciliation.png renamed to content/applications/finance/accounting/payments/batch/batch-bank-reconciliation.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_payments/batch/batch-customer-payment.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/payments/batch/batch-customer-payment.png.
CONFLICT (rename/delete): content/applications/finance/accounting/receivables/customer_payments/batch/batch-journal-settings.png renamed to content/applications/finance/accounting/payments/batch/batch-journal-settings.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_payments/batch/batch-lines-selection.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/payments/batch/batch-lines-selection.png.
CONFLICT (rename/delete): content/applications/finance/accounting/receivables/customer_payments/batch/batch-payments-selection.png renamed to content/applications/finance/accounting/payments/batch/batch-payments-selection.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_payments/batch/batch-payments.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/payments/batch/batch-payments.png.
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_payments/batch/batch-reconciliation.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/payments/batch/batch-reconciliation.png.
CONFLICT (rename/delete): content/applications/finance/accounting/receivables/customer_payments/batch/batch-register-payment.png renamed to content/applications/finance/accounting/payments/batch/batch-register-payment.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
Auto-merging content/applications/finance/accounting/payments/batch_sdd.rst
Auto-merging content/applications/finance/accounting/payments/follow_up.rst
Auto-merging content/applications/finance/accounting/payments/internal_transfers.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/payments/internal_transfers.rst
Auto-merging content/applications/finance/accounting/payments/online.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/payments/online.rst
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_payments/online_payment/install_portal_patch.rst added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/payments/online/install_portal_patch.rst.
CONFLICT (file location): content/applications/finance/accounting/receivables/customer_payments/online_payment/online-payment-acquirers.png renamed to content/applications/finance/accounting/receivables/customer_payments/online_payment/online-payment-providers.png in HEAD, inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/payments/online/online-payment-providers.png.
CONFLICT (rename/rename): content/applications/finance/accounting/receivables/customer_payments/online_payment/online-payment-acquirers.png renamed to content/applications/finance/accounting/payments/online/online-payment-providers.png in HEAD and to content/applications/finance/accounting/payments/online/acquirers.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation).
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/usage.rst renamed to content/applications/finance/accounting/reporting/analytic.rst in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (modify/delete): content/applications/finance/accounting/reporting/analytic.rst deleted in HEAD and modified in 9614a852d ([MOV] accounting: restructuration of the accounting documentation).  Version 9614a852d ([MOV] accounting: restructuration of the accounting documentation) of content/applications/finance/accounting/reporting/analytic.rst left in tree.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses.rst renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses.rst in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase01.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase01.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase02.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase02.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase03.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase03.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase04.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase04.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase05.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase05.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase06.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase06.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase07.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase07.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase08.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase08.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase09.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase09.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase10.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase10.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/purchases_expenses/purchase11.png renamed to content/applications/finance/accounting/reporting/analytic/purchases_expenses/purchase11.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets.rst renamed to content/applications/finance/accounting/reporting/analytic/timesheets.rst in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets01.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets01.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets02.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets02.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets03.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets03.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets04.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets04.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets05.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets05.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets06.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets06.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets07.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets07.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets08.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets08.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets09.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets09.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets10.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets10.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets11.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets11.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets12.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets12.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets13.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets13.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/timesheets/timesheets14.png renamed to content/applications/finance/accounting/reporting/analytic/timesheets/timesheets14.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/usage/usage01.png renamed to content/applications/finance/accounting/reporting/analytic/usage01.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/usage/usage02.png renamed to content/applications/finance/accounting/reporting/analytic/usage02.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/others/analytic/usage/usage03.png renamed to content/applications/finance/accounting/reporting/analytic/usage03.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (file location): content/applications/finance/accounting/others/analytic_accounting.rst added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/analytic_accounting.rst.
CONFLICT (file location): content/applications/finance/accounting/others/analytic_accounting/analytic_distribution.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/analytic_accounting/analytic_distribution.png.
CONFLICT (file location): content/applications/finance/accounting/others/analytic_accounting/analytic_plans.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/analytic_accounting/analytic_plans.png.
Auto-merging content/applications/finance/accounting/reporting/customize.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/reporting/customize.rst
CONFLICT (rename/delete): content/applications/finance/accounting/reporting/overview/customize/customize02.png renamed to content/applications/finance/accounting/reporting/customize/customize02.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/reporting/overview/customize/customize04.png renamed to content/applications/finance/accounting/reporting/customize/customize04.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/customize/engine-accounting-reports.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/customize/engine-accounting-reports.png.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/customize/engine-columns.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/customize/engine-columns.png.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/customize/engine-create-menu-item.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/customize/engine-create-menu-item.png.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/customize/engine-expressions.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/customize/engine-expressions.png.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/customize/engine-lines-options.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/customize/engine-lines-options.png.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/customize/engine-variant.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/customize/engine-variant.png.
CONFLICT (modify/delete): content/applications/finance/accounting/reporting/overview.rst deleted in 9614a852d ([MOV] accounting: restructuration of the accounting documentation) and modified in HEAD.  Version HEAD of content/applications/finance/accounting/reporting/overview.rst left in tree.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/tax_carryover.rst added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/tax_carryover.rst.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/tax_carryover/belgian-example.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/tax_carryover/belgian-example.png.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/tax_carryover/pop-up.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/tax_carryover/pop-up.png.
CONFLICT (file location): content/applications/finance/accounting/reporting/overview/tax_carryover/tax-return.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/reporting/tax_carryover/tax-return.png.
Auto-merging content/applications/finance/accounting/taxes/fiscal_positions.rst
Auto-merging content/applications/finance/accounting/vendor_bills.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/vendor_bills.rst
CONFLICT (file location): content/applications/finance/accounting/getting_started/process_overview/supplier_bill/bill-completion.png added in HEAD inside a directory that was renamed in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), suggesting it should perhaps be moved to content/applications/finance/accounting/vendor_bills/bill-completion.png.
Auto-merging content/applications/finance/accounting/vendor_bills/invoice_digitization.rst
CONFLICT (content): Merge conflict in content/applications/finance/accounting/vendor_bills/invoice_digitization.rst
CONFLICT (rename/delete): content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill01.png renamed to content/applications/finance/accounting/vendor_bills/vendor_bill01.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill02.png renamed to content/applications/finance/accounting/vendor_bills/vendor_bill02.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill03.png renamed to content/applications/finance/accounting/vendor_bills/vendor_bill03.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill04.png renamed to content/applications/finance/accounting/vendor_bills/vendor_bill04.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill05.png renamed to content/applications/finance/accounting/vendor_bills/vendor_bill05.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/finance/accounting/getting_started/process_overview/supplier_bill/vendor_bill06.png renamed to content/applications/finance/accounting/vendor_bills/vendor_bill06.png in 9614a852d ([MOV] accounting: restructuration of the accounting documentation), but deleted in HEAD.
Auto-merging content/applications/finance/fiscal_localizations.rst
Auto-merging content/applications/finance/fiscal_localizations/italy.rst
CONFLICT (modify/delete): content/applications/finance/payment_acquirers.rst deleted in HEAD and modified in 9614a852d ([MOV] accounting: restructuration of the accounting documentation).  Version 9614a852d ([MOV] accounting: restructuration of the accounting documentation) of content/applications/finance/payment_acquirers.rst left in tree.
Auto-merging content/applications/sales/sales/products_prices.rst
Auto-merging content/applications/websites/ecommerce.rst
CONFLICT (content): Merge conflict in content/applications/websites/ecommerce.rst
CONFLICT (modify/delete): content/applications/websites/ecommerce/getting_started/product_page.rst deleted in HEAD and modified in 9614a852d ([MOV] accounting: restructuration of the accounting documentation).  Version 9614a852d ([MOV] accounting: restructuration of the accounting documentation) of content/applications/websites/ecommerce/getting_started/product_page.rst left in tree.
Auto-merging content/developer/howtos/accounting_localization.rst
CONFLICT (content): Merge conflict in content/developer/howtos/accounting_localization.rst

stderr:

20:20:50.641277 git.c:455               trace: built-in: git cherry-pick 9614a852d1b223a24e4e6f9867753ee1dc79de68
error: could not apply 9614a852d... [MOV] accounting: restructuration of the accounting documentation
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

[jcs-odoo]

@robodoo r+