Merge proposals dependent on lp://staging/~florian-dacosta/ocb-addons/7.0_purchase_line_partner_fix

1. 7.0_purchase_line_partner_fix
2. Dependent merge proposals