Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-1218271-dja

lp:~openerp-dev/openobject-addons/trunk-bug-1218271-dja has no merge proposals.