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

[fw-bot]

task-3284514

• update of access pos settings
  Task-3256407

Forward-Port-Of: #4227
Forward-Port-Of: #4226

[robodoo]

Pull request status dashboard.

[fw-bot]

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

stdout:

CONFLICT (rename/delete): content/applications/sales/point_of_sale/shop/invoice/invoice04.png renamed to content/applications/sales/point_of_sale/customer-add.png in d068d005a ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/shop/invoice/invoice03.png renamed to content/applications/sales/point_of_sale/customer-button.png in d068d005a ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (modify/delete): content/applications/sales/point_of_sale/overview/getting_started.rst deleted in d068d005a ([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 d068d005a ([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/stripe.rst added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/payment_methods/terminals/stripe.rst.
CONFLICT (file location): content/applications/sales/point_of_sale/payment/stripe/create-method-stripe.png added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/payment_methods/terminals/stripe/create-method-stripe.png.
CONFLICT (file location): content/applications/sales/point_of_sale/payment/stripe/stripe-connect.png added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/payment_methods/terminals/stripe/stripe-connect.png.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/restaurant/fiscal_position/fiscal_position_01.png renamed to content/applications/sales/point_of_sale/pricing/fiscal_position/fiscal_position_01.png in d068d005a ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/restaurant/fiscal_position/fiscal_position_02.png renamed to content/applications/sales/point_of_sale/pricing/fiscal_position/fiscal_position_02.png in d068d005a ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/restaurant/fiscal_position/fiscal_position_03.png renamed to content/applications/sales/point_of_sale/pricing/fiscal_position/fiscal_position_03.png in d068d005a ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (file location): content/applications/sales/point_of_sale/restaurant/fiscal_position/flexible-taxes-setting.png added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/pricing/fiscal_position/flexible-taxes-setting.png.
CONFLICT (file location): content/applications/sales/point_of_sale/restaurant/fiscal_position/set-tax.png added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/pricing/fiscal_position/set-tax.png.
CONFLICT (file location): content/applications/sales/point_of_sale/shop/invoice/invoice-button.png added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/receipts_invoices/invoice-button.png.
CONFLICT (file location): content/applications/sales/point_of_sale/shop/invoice/invoice-smart-button.png added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/receipts_invoices/invoice-smart-button.png.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/shop/invoice/invoice01.png renamed to content/applications/sales/point_of_sale/receipts_invoices/invoice01.png in d068d005a ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/shop/invoice/invoice02.png renamed to content/applications/sales/point_of_sale/receipts_invoices/invoice02.png in d068d005a ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/shop/invoice/invoice05.png renamed to content/applications/sales/point_of_sale/receipts_invoices/invoice05.png in d068d005a ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (rename/delete): content/applications/sales/point_of_sale/shop/invoice/invoice06.png renamed to content/applications/sales/point_of_sale/receipts_invoices/invoice06.png in d068d005a ([MOV] pos: restructuration of pos toctree), but deleted in HEAD.
CONFLICT (file location): content/applications/sales/point_of_sale/shop/invoice/order-status.png added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/receipts_invoices/order-status.png.
CONFLICT (file location): content/applications/sales/point_of_sale/shop/invoice/select-customer-ui.png added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/receipts_invoices/select-customer-ui.png.
CONFLICT (file location): content/applications/sales/point_of_sale/overview/getting_started/refund.png added in HEAD inside a directory that was renamed in d068d005a ([MOV] pos: restructuration of pos toctree), suggesting it should perhaps be moved to content/applications/sales/point_of_sale/refund.png.
Auto-merging content/applications/sales/point_of_sale/restaurant.rst
CONFLICT (modify/delete): content/applications/sales/point_of_sale/shop/invoice.rst deleted in d068d005a ([MOV] pos: restructuration of pos toctree) and modified in HEAD.  Version HEAD of content/applications/sales/point_of_sale/shop/invoice.rst left in tree.
Auto-merging redirects/14.0.txt

stderr:

01:08:01.133651 git.c:455               trace: built-in: git cherry-pick d068d005a8449aa7fe7234441637e25127ef2fd7
error: could not apply d068d005a... [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+