Skip to content
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

[FW][FIX] academic: fix compute name of groups and demo academic #185

Open
wants to merge 1 commit into
base: 18.0
Choose a base branch
from

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #183

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

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

stderr:

18:20:58.919278 git.c:444               trace: built-in: git cherry-pick 2339147e4a304c98a792b54ecf5f1945919df6c6
error: could not apply 2339147... [FIX] academic: fix compute name of groups and demo academic
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-h-86537-lef-tysb-fw branch 3 times, most recently from 190bc45 to 7f91716 Compare January 20, 2025 15:38
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