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][IMP] academic: add field for payment responsible #195

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #194

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

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

stdout:

Auto-merging academic/wizards/account_move_send.py
Auto-merging academic/models/account_move.py
Auto-merging academic/i18n/es.po
Auto-merging academic/__manifest__.py
CONFLICT (content): Merge conflict in academic/__manifest__.py

stderr:

18:39:10.213202 git.c:444               trace: built-in: git cherry-pick 0ed8e49c11d21639690f4f13b1a273f0cdff79af
error: could not apply 0ed8e49... [IMP] academic: add field for payment responsible
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-47666-lef-Q3LD-fw branch from aebe8e0 to 7da4efb Compare January 24, 2025 13:42
@lef-adhoc
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in 08c8b58 Jan 24, 2025
@roboadhoc roboadhoc added the 17.1 label Jan 24, 2025
@lef-adhoc lef-adhoc deleted the 18.0-17.0-t-47666-lef-Q3LD-fw branch January 24, 2025 14:06
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