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][ADD] account_accountant_ux: restore Balance in GL #295

Closed

Conversation

fw-bot-adhoc
Copy link
Contributor

restore Balance in GL data on account journal dashboard

Forward-Port-Of: #294

restore Balance in GL data on account journal dashboard

X-original-commit: b309738
@roboadhoc
Copy link
Contributor

@fw-bot-adhoc
Copy link
Contributor Author

@ica-adhoc @jjscarafia cherrypicking of pull request #294 failed.

stdout:

Auto-merging account_accountant_ux/__manifest__.py
CONFLICT (content): Merge conflict in account_accountant_ux/__manifest__.py

stderr:

18:08:31.199227 git.c:444               trace: built-in: git cherry-pick ff8a75c11e6e3af4927717cfd07903d8a76f93f7
error: could not apply ff8a75c... [ADD] account_accountant_ux: restore Balance in GL
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
Copy link
Member

re-evaluando si es necesario en 17 en tarea 35269

@jjscarafia jjscarafia closed this Apr 24, 2024
@jjscarafia jjscarafia deleted the 17.0-16.0-t-35269-ica-MRbH-fw branch April 24, 2024 18:40
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

4 participants