Merge proposals dependent on lp:~vauxoo/addons-vauxoo/addons-vauxoo-stock_picking_cancel_move-dev-julio

1. addons-vauxoo-stock_picking_cancel_move-dev-julio
2. Dependent merge proposals