Merge proposals dependent on lp://staging/~yann-papouin/openobject-addons/7.0-bug-1188629-price-surchage-uom

1. 7.0-bug-1188629-price-surchage-uom
2. Dependent merge proposals