Merge proposals dependent on lp:~camptocamp/margin-analysis/7.0-fix-product_historical_margin-no-product-yvr

1. 7.0-fix-product_historical_margin-no-product-yvr
2. Dependent merge proposals