Merge proposals dependent on lp:~openerp-dev/openerp-web/7.0-opw-584587-msh

lp:~openerp-dev/openerp-web/7.0-opw-584587-msh has no merge proposals.