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

[FIX] mrp_subcontracting, stock: don't change loc when dupe SN

2021-11-03 16:02:07 +00:00

mrp_bom.py

[FIX] mrp_subcontracting: avoid byproduct

2021-09-03 10:37:47 +00:00

mrp_production.py

Cherry pick of 20858c2a8805d9ec08edb98b090badf6c73fc342 failed

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

product.py

[REF] *: rename name into partner_id on supplierinfo

2021-10-27 15:48:51 +00:00

res_company.py

…

res_partner.py

…

stock_move_line.py

[FIX] mrp_subcontracting, stock: don't change loc when dupe SN

2021-11-03 16:02:07 +00:00

stock_move.py

[FIX] mrp_subcontracting: fix details move button

2021-09-29 08:33:14 +00:00

stock_picking.py

Cherry pick of 20858c2a8805d9ec08edb98b090badf6c73fc342 failed

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

stock_quant.py

[IMP] stock,mrp_subcontracting: rearange quants filters

2021-09-02 12:57:33 +00:00

stock_rule.py

…

stock_warehouse.py

[IMP] mrp_subcontracting: add a operation type for resupply

2021-09-03 10:37:46 +00:00