Merge proposals dependent on lp:openerp-ccorp-addons/trunk

lp:openerp-ccorp-addons/trunk has no merge proposals.