[MERGE] Sync with trunk

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

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 62d12ef..199d86b 100644 (file)
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -3565,6 +3565,10 @@ class BaseModel(object):
         self.check_access_rights(cr, user, 'read')
         if not fields:
             fields = list(set(self._columns.keys() + self._inherit_fields.keys()))
+            #remove depricated fields from field list 
+            for field in self._columns.keys():
+                if getattr(self._columns[field], 'deprecated'):
+                    fields.remove(field)
         if isinstance(ids, (int, long)):
             select = [ids]
         else: