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][FW][FIX] l10n_uy_edi: e-invoice line wo product #256

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

Conversation

fw-bot-adhoc
Copy link
Contributor

ticket: 82127
This is a manual FW of this one #253

Forward-Port-Of: #255

ticket: 82127
FW creado maualmente por problemas con los repos nuevos de UY

X-original-commit: 65c572b
@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

@mem-adhoc @zaoral cherrypicking of pull request #255 failed.

stdout:

CONFLICT (modify/delete): l10n_uy_edi/models/l10n_uy_cfe.py deleted in HEAD and modified in 0d7b098 ([FW][FIX] l10n_uy_edi: e-invoice line wo product). Version 0d7b098 ([FW][FIX] l10n_uy_edi: e-invoice line wo product) of l10n_uy_edi/models/l10n_uy_cfe.py left in tree.

stderr:

13:12:57.536983 git.c:444               trace: built-in: git cherry-pick 0d7b09820897dd743340ec7ab782c7cc107e0a9d
error: could not apply 0d7b098... [FW][FIX] l10n_uy_edi: e-invoice line wo product
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

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