[FIX] revert MP lp:754339
Merge branch 'ocb-7.0' of github.com:akretion/openerp-addons into ocb-7.0