search

ingadhoc / odoo-argentina

Una Localización Argentina de Odoo amigable
http://www.odooargentina.com
GNU Affero General Public License v3.0
106 stars 191 forks source link

[FW][FIX] l10n_ar_purchase: Agregamos traducciones #921

Closed fw-bot-adhoc closed 2 weeks ago

fw-bot-adhoc commented 1 month ago

Forward-Port-Of: ingadhoc/odoo-argentina#917

roboadhoc commented 1 month ago

Pull request status dashboard.

fw-bot-adhoc commented 1 month ago

@mem-adhoc @zaoral cherrypicking of pull request ingadhoc/odoo-argentina#917 failed.

stdout:

Auto-merging l10n_ar_purchase/i18n/es.po
CONFLICT (content): Merge conflict in l10n_ar_purchase/i18n/es.po
Auto-merging l10n_ar_purchase/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ar_purchase/__manifest__.py

stderr:

20:19:52.146008 git.c:444               trace: built-in: git cherry-pick c012f35da626d804e5103ee61010cbe6d1945f45
error: could not apply c012f35d... [FIX] l10n_ar_purchase: Agregamos traducciones
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

mem-adhoc commented 2 weeks ago

Cerramos este PR porque se encarga el bot de transifex