[FW][FIX] account_ux: Found possible duplicates

[fw-bot-adhoc]

ticket 48922

Should only be applied to statement lines on the same journal. Before this change, we were wrongly suggestion duplicated because we were searching across journals.

Forward-Port-Of: #349
Forward-Port-Of: #329

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@zaoral cherrypicking of pull request #329 failed.

stdout:

CONFLICT (modify/delete): account_ux/data/ir_actions_server_data.xml deleted in HEAD and modified in c748c8d5... [FIX] account_ux: Found possible duplicates. Version c748c8d5... [FIX] account_ux: Found possible duplicates of account_ux/data/ir_actions_server_data.xml left in tree.
Auto-merging account_ux/__manifest__.py
CONFLICT (content): Merge conflict in account_ux/__manifest__.py

stderr:

16:54:12.243658 git.c:439               trace: built-in: git cherry-pick c748c8d55b3fafdcd8891947972143b300e8186e
error: could not apply c748c8d5... [FIX] account_ux: Found possible duplicates
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.