Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-717198-pso

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