[FW][BP]stock_landed_costs_ux: backport in 16.0

[fw-bot-adhoc]

Forward-Port-Of: #601

[roboadhoc]

Pull request status dashboard.

[fw-bot-adhoc]

@mav-adhoc @ced-adhoc cherrypicking of pull request #601 failed.

stdout:

CONFLICT (rename/add): Rename sale_order_type_invoice_policy_invoice_link/__manifest__.py->stock_landed_costs_ux/__manifest__.py in HEAD.  Added stock_landed_costs_ux/__manifest__.py in eb797d2d ([BP]stock_landed_costs_ux: backport in 16.0)
Auto-merging stock_landed_costs_ux/__manifest__.py

stderr:

19:19:43.789168 git.c:444               trace: built-in: git cherry-pick eb797d2d2933909dde408735b9fa2970cf3e6c31
error: could not apply eb797d2d... [BP]stock_landed_costs_ux: backport in 16.0
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