Skip to content

[FW][IMP] academic: add student in portal invoices #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #252

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

Auto-merging academic/__manifest__.py
CONFLICT (content): Merge conflict in academic/__manifest__.py

stderr:

15:04:57.397384 git.c:444               trace: built-in: git cherry-pick a41633bfc071513e134c228cf68144f4781b869a
error: could not apply a41633b... [IMP] academic: add student in portal invoices
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
----------
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.

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

@lef-adhoc lef-adhoc force-pushed the 18.0-17.0-t-50842-lef-MBIQ-fw branch from fb8a59c to f6306e0 Compare April 29, 2025 20:16
@lef-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in e5a8227 Apr 29, 2025
@roboadhoc roboadhoc added the 17.1 label Apr 29, 2025
@lef-adhoc lef-adhoc deleted the 18.0-17.0-t-50842-lef-MBIQ-fw branch April 30, 2025 14:27
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