7.0 pending merge

Merge proposal migrated from LP:

https://code.launchpad.net/~camptocamp/sale-financial/7.0-pending-merge