[IMP] Avoid to recatch error when OpenERP/Odoo is starting with the option --debug

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 3a38424..3103b17 100644 (file)
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2261,6 +2261,7 @@ class BaseModel(object):
                 view = getattr(self, '_get_default_%s_view' % view_type)(
                     cr, user, context)
             except AttributeError:
+                if config['debug_mode']: raise
                 # what happens here, graph case?
                 raise except_orm(_('Invalid Architecture!'), _("There is no view of type '%s' defined for the structure!") % view_type)
 

diff --git a/openerp/osv/osv.py b/openerp/osv/osv.py
index d870b0f..5233533 100644 (file)
--- a/openerp/osv/osv.py
+++ b/openerp/osv/osv.py
@@ -35,6 +35,7 @@ import openerp.sql_db as sql_db
 from openerp.tools.translate import translate
 from openerp.osv.orm import MetaModel, Model, TransientModel, AbstractModel
 import openerp.exceptions
+from openerp.tools.config import config
 
 import time
 import random
@@ -142,11 +143,13 @@ class object_proxy(object):
                     _logger.info("%s, retry %d/%d in %.04f sec..." % (errorcodes.lookup(e.pgcode), tries, MAX_TRIES_ON_CONCURRENCY_FAILURE, wait_time))
                     time.sleep(wait_time)
                 except orm.except_orm, inst:
+                    if config['debug_mode']: raise
                     _, _, tb = sys.exc_info()
                     raise except_osv(inst.name, inst.value), None, tb
                 except except_osv:
                     raise
                 except IntegrityError, inst:
+                    if config['debug_mode']: raise
                     osv_pool = pooler.get_pool(dbname)
                     for key in osv_pool._sql_error.keys():
                         if key in inst[0]: