Import from openerp
Simple changes