Merge lp:~syleam/openobject-server/trunk-fix-import_data-message into lp:openobject-server

[Christophe CHAUVET]

[Fabien (Open ERP) (fp-tinyerp)]

as been made in the import/export cleaning.

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2010-02-26 01:03:45 +0000
+++ bin/osv/orm.py	2010-02-26 18:23:16 +0000
@@ -902,11 +902,10 @@
                             msg = self.pool._sql_error[key]
                             break
                     return (-1, res, 'Line ' + str(counter) +' : ' + msg, '' )
-                if isinstance(e, osv.orm.except_orm ):
+                else:
                     msg = _('Insertion Failed! ' + e[1])
-                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '' )
-                #Raising Uncaught exception
-                raise
+                    return (-1, res, 'Line ' + str(counter) +' : ' + msg, '')
+
             for lang in translate:
                 context2 = context.copy()
                 context2['lang'] = lang