Merge proposals dependent on lp:~numerigraphe/openobject-addons/trunk-delivery-net-weight-extended-view

1. trunk-delivery-net-weight-extended-view
2. Dependent merge proposals