Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FW][FIX] l10n_ar_ux: invoice report sign and update manifest version #771

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

Forward-Port-Of: #770

@roboadhoc
Copy link

@fw-bot-adhoc
Copy link
Contributor Author

@jjscarafia cherrypicking of pull request #770 failed.

stdout:

Auto-merging l10n_ar_ux/reports/invoice_report.py
CONFLICT (content): Merge conflict in l10n_ar_ux/reports/invoice_report.py
Auto-merging l10n_ar_ux/__manifest__.py
CONFLICT (content): Merge conflict in l10n_ar_ux/__manifest__.py

stderr:

14:26:32.037626 git.c:444               trace: built-in: git cherry-pick d0d1bdcf7103dd936d64a72154df064194bd61c0
error: could not apply d0d1bdcf... [FIX] l10n_ar_ux: invoice report sign and update manifest version
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

closes ingadhoc#770

Signed-off-by: Juan José Scarafía <jjs@adhoc.com.ar>
@jjscarafia jjscarafia force-pushed the 17.0-16.0-t-33530-jjs2-RJ2L-fw branch from 58f5068 to e9bbfaf Compare April 24, 2024 12:57
@jjscarafia
Copy link
Member

@roboadhoc r+

@roboadhoc roboadhoc closed this in d398399 Apr 24, 2024
@roboadhoc roboadhoc added the 16.1 label Apr 24, 2024
@jjscarafia jjscarafia deleted the 17.0-16.0-t-33530-jjs2-RJ2L-fw branch April 24, 2024 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants