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] l10n_ar_edi_ux: boarding permission #296

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Task: 29241

Forward-Port-Of: #282

@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

@pablohmontenegro @zaoral cherrypicking of pull request #282 failed.

stdout:

Auto-merging l10n_ar_edi_ux/models/account_move.py
Auto-merging l10n_ar_edi_ux/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ar_edi_ux/__manifest__.py

stderr:

17:25:47.810078 git.c:444               trace: built-in: git cherry-pick 15c72df2fa96cff93b048b7f5a2d36c022b5b4b0
error: could not apply 15c72df... [IMP] l10n_ar_edi_ux: boarding permission
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

Task: 29241
X-original-commit: 391993c
@pablohmontenegro
Copy link
Contributor

@roboadhoc r+

@roboadhoc roboadhoc closed this in 851f236 Dec 26, 2023
@roboadhoc roboadhoc added the 16.1 label Dec 26, 2023
@fw-bot-adhoc fw-bot-adhoc deleted the 17.0-16.0-t-29241-pam-ow33-fw branch January 9, 2024 18:31
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.

None yet

3 participants