Merge lp:~florent.x/openobject-server/6.1-osv_parent_model into lp:openobject-server/6.1

[Florent]

Reorder few lines to check the existence of the parent_model before accessing its attributes.

=== modified file 'openerp/osv/orm.py'
--- openerp/osv/orm.py	2012-02-23 17:58:51 +0000
+++ openerp/osv/orm.py	2012-03-05 12:20:23 +0000
@@ -872,11 +872,11 @@
 
             for parent_name in ((type(parent_names)==list) and parent_names or [parent_names]):
                 parent_model = pool.get(parent_name)
-                if not getattr(cls, '_original_module', None) and name == parent_model._name:
-                    cls._original_module = parent_model._original_module
                 if not parent_model:
                     raise TypeError('The model "%s" specifies an unexisting parent class "%s"\n'
                         'You may need to add a dependency on the parent class\' module.' % (name, parent_name))
+                if not getattr(cls, '_original_module', None) and name == parent_model._name:
+                    cls._original_module = parent_model._original_module
                 parent_class = parent_model.__class__
                 nattr = {}
                 for s in attributes: