Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-817361-bde

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