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_ux: fix QR code link #807

Closed fw-bot-adhoc closed 8 months ago

fw-bot-adhoc commented 8 months ago

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

roboadhoc commented 8 months ago

Pull request status dashboard.

fw-bot-adhoc commented 8 months ago

@maq-adhoc @jjscarafia cherrypicking of pull request ingadhoc/odoo-argentina#806 failed.

stdout:

Auto-merging l10n_ar_ux/views/report_invoice.xml
Auto-merging l10n_ar_ux/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ar_ux/__manifest__.py

stderr:

18:03:24.994776 git.c:444               trace: built-in: git cherry-pick df062bec5e407f9ebe41ac3462d9dd1cfec9e138
error: could not apply df062bec... [FIX] l10n_ar_ux: fix QR code link
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