Merge proposals dependent on lp:~numerigraphe/openobject-addons/trunk-stock-editable-compatible-picking-line

1. trunk-stock-editable-compatible-picking-line
2. Dependent merge proposals