Merge proposals dependent on lp:~yann-papouin/ocb-addons/6.1-bug-1179398-salereport-year-domain

1. 6.1-bug-1179398-salereport-year-domain
2. Dependent merge proposals