[FIX] originally correct to-be-merged code broken during merge
[FIX] originally correct to-be-merged code broken during merge

havt/openerp-web,havt/openerp-web,akretion/openerp-web,havt/openerp-web,havt/openerp-web,havt/openerp-web,akretion/openerp-web,akretion/openerp-web