JF Aubert 047f2e556f Cherry pick of 20858c2a8805d9ec08edb98b090badf6c73fc342 failed ...

stdout:

stderr:
13:41:03.985365 git.c:344               trace: built-in: git cherry-pick 20858c2a8805d9ec08edb98b090badf6c73fc342
error: Cherry-picking is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: cherry-pick failed
----------
status:

closes odoo/odoo#79933

Signed-off-by: William Henrotin (whe) <whe@odoo.com>

2021-11-17 15:52:19 +00:00

..

__init__.py

…

mrp_consumption_warning.py

Cherry pick of 20858c2a8805d9ec08edb98b090badf6c73fc342 failed

2021-11-17 15:52:19 +00:00

stock_picking_return_views.xml

…

stock_picking_return.py

…