search

ingadhoc / account-financial-tools

GNU Affero General Public License v3.0
50 stars 102 forks source link

[FW][REM] account_ux: Moved action_reoncile to account_accountant_ux #586

Open fw-bot-adhoc opened 1 week ago

fw-bot-adhoc commented 1 week ago

Forward-Port-Of: ingadhoc/account-financial-tools#584

roboadhoc commented 1 week ago

Pull request status dashboard.

fw-bot-adhoc commented 1 week ago

@feg-adhoc @cav-adhoc cherrypicking of pull request ingadhoc/account-financial-tools#584 failed.

stdout:

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

stderr:

12:14:37.869731 git.c:444               trace: built-in: git cherry-pick ab59229e2c5ab46d3fa5df4cb4d05c2d38ed280a
error: could not apply ab59229e... [DEL] account_ux: Moved action_reoncile to account_accountant_ux
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