Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-1018401-kjo

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