[FW][MOV] pos: restructuration of pos toctree

[fw-bot]

task-3284514

Forward-Port-Of: #4226

[robodoo]

Pull request status dashboard.

[fw-bot]

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

stdout:

Auto-merging content/applications/finance/fiscal_localizations/belgium.rst
CONFLICT (rename/delete): content/applications/sales/point_of_sale/overview/getting_started/close-pos-session.png renamed to content/applications/sales/point_of_sale/close-pos-session.png in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (file location): content/applications/sales/point_of_sale/overview/getting_started/closing-control.png added in HEAD inside a directory that was renamed in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/closing-control.png.
CONFLICT (file location): content/applications/sales/point_of_sale/overview/customer_note.rst added in HEAD inside a directory that was renamed in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/configuration/customer_note.rst.
CONFLICT (file location): content/applications/sales/point_of_sale/overview/customer_notes/customer-notes-ui.png added in HEAD inside a directory that was renamed in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/configuration/customer_notes/customer-notes-ui.png.
CONFLICT (file location): content/applications/sales/point_of_sale/overview/customer_notes/notes-receipt.png added in HEAD inside a directory that was renamed in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/configuration/customer_notes/notes-receipt.png.
CONFLICT (modify/delete): content/applications/sales/point_of_sale/overview.rst deleted in bf48e5ba5 ([MOV] pos: restructuration of pos toctree) and modified in HEAD.  Version HEAD of content/applications/sales/point_of_sale/overview.rst left in tree.
CONFLICT (modify/delete): content/applications/sales/point_of_sale/overview/getting_started.rst deleted in bf48e5ba5 ([MOV] pos: restructuration of pos toctree) and modified in HEAD.  Version HEAD of content/applications/sales/point_of_sale/overview/getting_started.rst left in tree.
CONFLICT (modify/delete): content/applications/sales/point_of_sale/payment.rst deleted in bf48e5ba5 ([MOV] pos: restructuration of pos toctree) and modified in HEAD.  Version HEAD of content/applications/sales/point_of_sale/payment.rst left in tree.
CONFLICT (file location): content/applications/sales/point_of_sale/payment/worldline.rst added in HEAD inside a directory that was renamed in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/payment_methods/terminals/worldline.rst.
CONFLICT (file location): content/applications/sales/point_of_sale/payment/worldline/worldline-form.png added in HEAD inside a directory that was renamed in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/payment_methods/terminals/worldline/worldline-form.png.
CONFLICT (file location): content/applications/sales/point_of_sale/payment/worldline/worldline-ipsequence.png added in HEAD inside a directory that was renamed in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/payment_methods/terminals/worldline/worldline-ipsequence.png.
CONFLICT (file location): content/applications/sales/point_of_sale/payment/worldline/worldline-payment-terminals.png added in HEAD inside a directory that was renamed in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/payment_methods/terminals/worldline/worldline-payment-terminals.png.
CONFLICT (file location): content/applications/sales/point_of_sale/payment/worldline/worldline-payment.png added in HEAD inside a directory that was renamed in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/payment_methods/terminals/worldline/worldline-payment.png.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/shop/reprint/reprint01.png renamed to content/applications/sales/point_of_sale/receipts_invoices/reprint01.png in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/shop/reprint/reprint02.png renamed to content/applications/sales/point_of_sale/receipts_invoices/reprint02.png in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/shop/reprint/reprint03.png renamed to content/applications/sales/point_of_sale/receipts_invoices/reprint03.png in bf48e5ba5 ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
Auto-merging content/applications/sales/point_of_sale/shop.rst
CONFLICT (content): Merge conflict in content/applications/sales/point_of_sale/shop.rst
CONFLICT (modify/delete): content/applications/sales/point_of_sale/shop/cash_control.rst deleted in HEAD and modified in bf48e5ba5 ([MOV] pos: restructuration of pos toctree).  Version bf48e5ba5 ([MOV] pos: restructuration of pos toctree) of content/applications/sales/point_of_sale/shop/cash_control.rst left in tree.

stderr:

18:34:59.794161 git.c:455               trace: built-in: git cherry-pick bf48e5ba5cc0c3128d6abaddd9f1860f360e6930
error: could not apply bf48e5ba5... [MOV] pos: restructuration of pos toctree
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+