[FW][FIX] l10n_ar_edi_ux: obtener actividades monotributista.

[fw-bot-adhoc]

Ticket: 71023

Forward-Port-Of: #326

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

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

stdout:

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

stderr:

18:04:37.379248 git.c:444               trace: built-in: git cherry-pick 0e4098ae587d88b847ac7cae85accad67ed39fec
error: could not apply 0e4098a... [FIX] l10n_ar_edi_ux: obtener actividades monotributista.
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

[zaoral]

@roboadhoc r+