Merge proposals dependent on lp://staging/~credativ/openobject-addons/7.0-rounding-fix-average-price

1. 7.0-rounding-fix-average-price
2. Dependent merge proposals