Skip to content

Conversation

@fw-bot-adhoc
Copy link

Forward-Port-Of: #101

@roboadhoc
Copy link

Pull request status dashboard

@fw-bot-adhoc
Copy link
Author

@rov-adhoc @cav-adhoc cherrypicking of pull request #101 failed.

stdout:

CONFLICT (modify/delete): account_multi_store/__manifest__.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of account_multi_store/__manifest__.py left in tree.
CONFLICT (modify/delete): account_multi_store/security/multi_store_security.xml deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of account_multi_store/security/multi_store_security.xml left in tree.
CONFLICT (modify/delete): base_multi_store/__manifest__.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of base_multi_store/__manifest__.py left in tree.
CONFLICT (modify/delete): base_multi_store/security/multi_store_security.xml deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of base_multi_store/security/multi_store_security.xml left in tree.
CONFLICT (modify/delete): purchase_multi_store/__manifest__.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of purchase_multi_store/__manifest__.py left in tree.
CONFLICT (modify/delete): purchase_multi_store/security/multi_store_security.xml deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of purchase_multi_store/security/multi_store_security.xml left in tree.
CONFLICT (modify/delete): sale_multi_store/__manifest__.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of sale_multi_store/__manifest__.py left in tree.
CONFLICT (modify/delete): sale_multi_store/models/sale_order.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of sale_multi_store/models/sale_order.py left in tree.
CONFLICT (modify/delete): sale_multi_store/security/multi_store_security.xml deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of sale_multi_store/security/multi_store_security.xml left in tree.
CONFLICT (modify/delete): stock_multi_store/__manifest__.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of stock_multi_store/__manifest__.py left in tree.
CONFLICT (modify/delete): stock_multi_store/models/stock_orderpoint.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of stock_multi_store/models/stock_orderpoint.py left in tree.
CONFLICT (modify/delete): stock_multi_store/models/stock_picking_type.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of stock_multi_store/models/stock_picking_type.py left in tree.
CONFLICT (modify/delete): stock_multi_store/models/stock_rule.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of stock_multi_store/models/stock_rule.py left in tree.
CONFLICT (modify/delete): stock_multi_store/models/stock_warehouse.py deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of stock_multi_store/models/stock_warehouse.py left in tree.
CONFLICT (modify/delete): stock_multi_store/security/multi_store_security.xml deleted in 3ce56791f2274ac889d78b72c50e00b6f47c3b69 and modified in c40aa9299de644653209623b57506e96d602214e.  Version c40aa9299de644653209623b57506e96d602214e of stock_multi_store/security/multi_store_security.xml left in tree.

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.

⚠️ after resolving this conflict, you will need to merge it via @roboadhoc.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@rov-adhoc rov-adhoc closed this Nov 28, 2025
@fw-bot-adhoc fw-bot-adhoc deleted the 19.0-18.0-h-103881-rov-2150-fw branch December 5, 2025 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants