Skip to content

Conversation

@fw-bot-adhoc
Copy link
Contributor

…sible from partner and related views

Forward-Port-Of: #304

@roboadhoc
Copy link

Pull request status dashboard

@fw-bot-adhoc
Copy link
Contributor Author

@lef-adhoc @matiasperalta1 cherrypicking of pull request #304 failed.

stdout:

Auto-merging academic_sale_subscription/__manifest__.py
CONFLICT (content): Merge conflict in academic_sale_subscription/__manifest__.py
Auto-merging academic_sale_subscription/i18n/es.po
CONFLICT (content): Merge conflict in academic_sale_subscription/i18n/es.po

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

…sible from partner and related views

X-original-commit: f591a82
@lef-adhoc lef-adhoc force-pushed the 19.0-18.0-t-55661-lef-795-fw branch from 365dfe0 to 9f10d7f Compare January 2, 2026 20:18
@lef-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in 5049277 Jan 2, 2026
@roboadhoc roboadhoc added the 18.1 label Jan 2, 2026
@roboadhoc roboadhoc deleted the 19.0-18.0-t-55661-lef-795-fw branch January 2, 2026 20:22
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