Attempted fix for #2088

It's not very clean in some cases but should convey the idea of where things go wrong.
Also I noted that the new openerp.fields.Field `repr` function yields 'None.None' for new api style field while running the `_setup_regular` function because the field was not yet called with `_add_field` on model.BaseModel