Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-1212026-ypa

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