Skip to content

Conversation

@fw-bot-adhoc
Copy link
Contributor

…images

Forward-Port-Of: #1523

@roboadhoc
Copy link

Pull request status dashboard

@fw-bot-adhoc
Copy link
Contributor Author

@lef-adhoc @lav-adhoc cherrypicking of pull request #1523 failed.

stdout:

Auto-merging sale_ux/__manifest__.py
CONFLICT (content): Merge conflict in sale_ux/__manifest__.py
Auto-merging sale_ux/views/sale_reports.xml
CONFLICT (content): Merge conflict in sale_ux/views/sale_reports.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

@lef-adhoc lef-adhoc force-pushed the 19.0-18.0-h-107435-lef-3019-fw branch from 7c8ad62 to e7b6c10 Compare January 13, 2026 19:51
@lef-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in af476cb Jan 13, 2026
@roboadhoc roboadhoc added the 18.1 label Jan 13, 2026
@roboadhoc roboadhoc deleted the 19.0-18.0-h-107435-lef-3019-fw branch January 13, 2026 20:03
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