Merge proposals dependent on lp:~openerp/openobject-addons/old_trunk

lp:~openerp/openobject-addons/old_trunk has no merge proposals.