[MERGE] forward port of branch 7.0 up to 4bfcbb2

[odoo/odoo.git] / openerp / osv / fields.py

diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py
index c7a4b4c..aad59fd 100644 (file)
--- a/openerp/osv/fields.py
+++ b/openerp/osv/fields.py
@@ -1505,7 +1505,8 @@ class property(function):
         default_val = self._get_default(obj, cr, uid, prop_name, context)
 
         property_create = False
-        if isinstance(default_val, openerp.osv.orm.browse_record):
+        if isinstance(default_val, (openerp.osv.orm.browse_record,
+                                    openerp.osv.orm.browse_null)):
             if default_val.id != id_val:
                 property_create = True
         elif default_val != id_val: