Merge proposals dependent on lp:~openerp-dev/openobject-addons/7.0-bug-1178835

lp:~openerp-dev/openobject-addons/7.0-bug-1178835 has no merge proposals.