[FW][FIX] l10n_uy_edi: Fix en el manejo de formatos de reporte

[fw-bot-adhoc]

Ticket: 80829

Forward-Port-Of: #245

[fw-bot-adhoc]

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

stdout:

CONFLICT (modify/delete): l10n_uy_edi/tests/__init__.py deleted in HEAD and modified in 9d4dcf0 ([FIX] l10n_uy_edi: Fix en el manejo de formatos de reporte). Version 9d4dcf0 ([FIX] l10n_uy_edi: Fix en el manejo de formatos de reporte) of l10n_uy_edi/tests/__init__.py left in tree.
CONFLICT (modify/delete): l10n_uy_edi/models/res_company.py deleted in HEAD and modified in 9d4dcf0 ([FIX] l10n_uy_edi: Fix en el manejo de formatos de reporte). Version 9d4dcf0 ([FIX] l10n_uy_edi: Fix en el manejo de formatos de reporte) of l10n_uy_edi/models/res_company.py left in tree.
CONFLICT (modify/delete): l10n_uy_edi/models/l10n_uy_cfe.py deleted in HEAD and modified in 9d4dcf0 ([FIX] l10n_uy_edi: Fix en el manejo de formatos de reporte). Version 9d4dcf0 ([FIX] l10n_uy_edi: Fix en el manejo de formatos de reporte) of l10n_uy_edi/models/l10n_uy_cfe.py left in tree.

stderr:

20:19:57.468338 git.c:444               trace: built-in: git cherry-pick 9d4dcf079bb171a28d8c3296f508ede053aeb1f0
error: could not apply 9d4dcf0... [FIX] l10n_uy_edi: Fix en el manejo de formatos de reporte
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

[roboadhoc]

Pull request status dashboard.