[FW][FIX] l10n_uy_ux: added internal_type for E-Resguardos

[fw-bot-adhoc]

Forward-Port-Of: #282

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@jue-adhoc @zaoral cherrypicking of pull request #282 failed.

stdout:

Auto-merging l10n_uy_ux/__manifest__.py
CONFLICT (content): Merge conflict in l10n_uy_ux/__manifest__.py

stderr:

20:30:37.581742 git.c:444               trace: built-in: git cherry-pick a2a29e33b79124a687e9ce57d7399a7c4a5608a3
error: could not apply a2a29e3... [FIX] l10n_uy_ux: added internal_type for E-Resguardos
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