diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 007b54ee46c..d0a8e8e3a7e 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2974,7 +2974,7 @@ class BaseModel(object):
         update_custom_fields = context.get('update_custom_fields', False)
         self._field_create(cr, context=context)
         create = not self._table_exist(cr)
-        if getattr(self, '_auto', True):
+        if self._auto:
 
             if create:
                 self._create_table(cr)
@@ -3208,7 +3208,8 @@ class BaseModel(object):
 
         cr.commit()     # start a new transaction
 
-        self._add_sql_constraints(cr)
+        if self._auto:
+            self._add_sql_constraints(cr)
 
         if create:
             self._execute_sql(cr)