[FIX] fields.py: html_sanitize now in mail file.

bzr revid: tde@openerp.com-20121106122758-iwyxmedgnznpjyna

openerp/osv/fields.py

@@ -45,7 +45,7 @@ import openerp.tools as tools
 from openerp.tools.translate import _
 from openerp.tools import float_round, float_repr
 import simplejson
-from openerp.tools.html_sanitize import html_sanitize
+from openerp.tools.mail import html_sanitize
 from openerp import SUPERUSER_ID
 
 _logger = logging.getLogger(__name__)

openerp/osv/osv.py

@@ -120,6 +120,7 @@ class object_proxy(object):
                     raise except_osv('Database not ready', 'Currently, this database is not fully loaded and can not be used.')
                 return f(self, dbname, *args, **kwargs)
             except orm.except_orm, inst:
+                raise
                 raise except_osv(inst.name, inst.value)
             except except_osv:
                 raise