Skip to content

Conversation

@fw-bot-adhoc
Copy link

Forward-Port-Of: #440

@roboadhoc
Copy link

Pull request status dashboard

@fw-bot-adhoc
Copy link
Author

@JrAdhoc @cem-adhoc cherrypicking of pull request #440 failed.

stdout:

Auto-merging website_sale_order_validity/__manifest__.py
CONFLICT (content): Merge conflict in website_sale_order_validity/__manifest__.py
Auto-merging website_sale_order_validity/views/templates.xml
CONFLICT (content): Merge conflict in website_sale_order_validity/views/templates.xml

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

@fw-bot-adhoc
Copy link
Author

@JrAdhoc @cem-adhoc this forward port of #440 is awaiting action (not merged or closed).

@JrAdhoc JrAdhoc force-pushed the 19.0-18.0-t-62332-jr-3115-fw branch from acd2519 to ff027ae Compare January 19, 2026 11:29
@JrAdhoc JrAdhoc force-pushed the 19.0-18.0-t-62332-jr-3115-fw branch from ff027ae to 65c6d2c Compare January 19, 2026 11:31
@cem-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in d38da8c Jan 19, 2026
@roboadhoc roboadhoc added the 18.1 label Jan 19, 2026
@roboadhoc roboadhoc deleted the 19.0-18.0-t-62332-jr-3115-fw branch January 19, 2026 12:47
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.

4 participants