[RVT] Revert revno. 9472 (lp:1156215) as this was fixed independently
	on upstream
[RVT] Revert revno. 9472 (lp:1156215) as this was fixed independently
	on upstream
Merge branch 'rs-ocb-7.0' of github.com:akretion/openerp-addons into rs-ocb-7.0