From 8fef0b9a570cf0cfa5bb003e96e5d31519607deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 10 Aug 2012 09:32:42 +0200 Subject: [PATCH] [IMP] Removed unnecessary conditions. bzr revid: tde@openerp.com-20120810073242-5nc7h84x9r17kabl --- openerp/osv/orm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 8c727424890..345f26d7cb2 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -3601,7 +3601,7 @@ class BaseModel(object): # Warn about deprecated fields now that fields_pre and fields_post are computed for f in fields_pre + fields_post: - field_column = (f != self.CONCURRENCY_CHECK_FIELD and self._all_columns.get(f) and self._all_columns.get(f).column) + field_column = self._all_columns.get(f) and self._all_columns.get(f).column if field_column and field_column.deprecated: _logger.warning('Field %s.%s is deprecated: %s', self._name, f, field_column.deprecated) @@ -3982,7 +3982,7 @@ class BaseModel(object): direct = [] totranslate = context.get('lang', False) and (context['lang'] != 'en_US') for field in vals: - field_column = (field != self.CONCURRENCY_CHECK_FIELD and self._all_columns.get(field) and self._all_columns.get(field).column) + field_column = self._all_columns.get(field) and self._all_columns.get(field).column if field_column and field_column.deprecated: _logger.warning('Field %s.%s is deprecated: %s', self._name, field, field_column.deprecated) if field in self._columns: