Merge pull request #2178 from odoo-dev/8.0-wmsmultiop-jco