Merge proposals dependent on lp:~openerp-dev/openobject-addons/trunk-bug-1104099-hip

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