[MRG] merge with lp:openerp-web