Merge proposals dependent on lp:~openerp-dev/openobject-addons/6.0-sale-purchase-invoiced-rha

1. 6.0-sale-purchase-invoiced-rha
2. Dependent merge proposals