Skip to content

[FW][IMP] academic_*: academic users can write in groups but not create #249

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: #241

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

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

stderr:

14:29:56.478954 git.c:444               trace: built-in: git cherry-pick 7431440c5327d3222101288d2573fc4411970021
error: could not apply 7431440... [IMP] academic_*: academic users can write in groups but not create
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-50063-lef-TfYz-fw branch 2 times, most recently from b813b10 to 09730cf Compare April 17, 2025 18:57
closes ingadhoc#248

X-original-commit: 81ea55d
Signed-off-by: lav-adhoc <lav@adhoc.com.ar>
Signed-off-by: Franco Leyes <lef@adhoc.com.ar>
@lef-adhoc lef-adhoc force-pushed the 18.0-17.0-t-50063-lef-TfYz-fw branch from 09730cf to ca73970 Compare April 17, 2025 19:00
@lef-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in ee40dc5 Apr 17, 2025
@roboadhoc roboadhoc added the 17.1 label Apr 17, 2025
@lef-adhoc lef-adhoc deleted the 18.0-17.0-t-50063-lef-TfYz-fw branch April 17, 2025 19:19
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