Closed fw-bot-adhoc closed 7 months ago
@pablohmontenegro @zaoral cherrypicking of pull request ingadhoc/odoo-argentina#814 failed.
stdout:
Auto-merging l10n_ar_ux/models/account_payment.py
CONFLICT (content): Merge conflict in l10n_ar_ux/models/account_payment.py
stderr:
19:49:23.123018 git.c:444 trace: built-in: git cherry-pick c790bc64c913ebb0ede1ec28e71fdc4528abb65b
error: could not apply c790bc64... [FIX] l10n_ar_ux: check_number al crear un recibo de cliente
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
Ticket: 71175
Forward-Port-Of: ingadhoc/odoo-argentina#814