Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-replace-inherit_option_id-xmo

lp:~openerp-dev/openobject-addons/trunk-replace-inherit_option_id-xmo has no merge proposals.