summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVo Minh Thu <vmt@openerp.com>2011-05-27 12:03:10 +0200
committerVo Minh Thu <vmt@openerp.com>2011-05-27 12:03:10 +0200
commitee58f9da5ffc8bb0dc2c41deafeabbe5351aa276 (patch)
treeb7aefb0915c920caf2a0a6172d53e1a3ea557b0c
parenta87ebe96001cb128336951d3e95206026bbc5154 (diff)
[FIX] osv_pool: it appears it is necessary to have the model in the pool earlier on.
bzr revid: vmt@openerp.com-20110527100310-qw9760rd8spiwjgm
-rw-r--r--openerp/osv/orm.py1
-rw-r--r--openerp/osv/osv.py4
2 files changed, 2 insertions, 3 deletions
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 4493440c936..83cf852fcdd 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -639,6 +639,7 @@ class orm_template(object):
def __init__(self, pool, cr):
""" Initialize a model and make it part of the given registry."""
+ pool.add(self._name, self)
self.pool = pool
if not self._name and not hasattr(self, '_inherit'):
diff --git a/openerp/osv/osv.py b/openerp/osv/osv.py
index 40b448fcd82..97cdc1b2a3f 100644
--- a/openerp/osv/osv.py
+++ b/openerp/osv/osv.py
@@ -243,9 +243,7 @@ class osv_pool(object):
# Instanciate classes registered through their constructor and
# add them to the pool.
for klass in module_class_list.get(module, []):
- inst = klass.createInstance(self, module, cr)
- self.add(inst._name, inst)
- res.append(inst)
+ res.append(klass.createInstance(self, module, cr))
return res