Merge proposals dependent on lp:~openerp-dev/openobject-server/6.0-opw-765124

lp:~openerp-dev/openobject-server/6.0-opw-765124 has no merge proposals.