Merge proposals dependent on lp:~openerp-dev/openobject-addons/7.0-bug-1241008-dhs

lp:~openerp-dev/openobject-addons/7.0-bug-1241008-dhs has no merge proposals.