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: cambio en vista l10n_ar.custom_header #908

Closed fw-bot-adhoc closed 1 month ago

fw-bot-adhoc commented 1 month ago

While accessing /my/invoices, and having installed l10n_ar, we have a warning that the t-esc is not understood. The inherited attribute then does not work. Let's replace it for a t-out. Ticket Adhoc side: 79024

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

roboadhoc commented 1 month ago

Pull request status dashboard.

fw-bot-adhoc commented 1 month ago

@pablohmontenegro @jjscarafia cherrypicking of pull request ingadhoc/odoo-argentina#904 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:

19:51:39.107145 git.c:444               trace: built-in: git cherry-pick 698675d7c0cbbfe814dc0ef12ae31512c5fc8ced
error: could not apply 698675d7... [FIX] l10n_ar_ux: cambio en vista l10n_ar.custom_header.
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

jjscarafia commented 1 month ago

en 17 ya estaba cambiado