From 34678d2be6100d5809013133bdfa86da92ebdcc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Mon, 4 Nov 2019 16:05:28 +0100
Subject: [PATCH] Backed out changeset f08b9ce07a7b

---
 trytond/model/modelsql.py      | 2 --
 trytond/tests/test_modelsql.py | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py
index 0ace0b7fdb..ac5a5604bb 100644
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -539,8 +539,6 @@ class ModelSQL(ModelStorage):
                         '%s,%s' % (cls.__name__, id_))
                 except KeyError:
                     continue
-                if timestamp is None:
-                    continue
                 sql_type = fields.Char('timestamp').sql_type().base
                 where.append((table.id == id_)
                     & (Extract('EPOCH',
diff --git a/trytond/tests/test_modelsql.py b/trytond/tests/test_modelsql.py
index 2e73b85f72..5c8b079eac 100644
--- a/trytond/tests/test_modelsql.py
+++ b/trytond/tests/test_modelsql.py
@@ -305,10 +305,6 @@ class ModelSQLTestCase(unittest.TestCase):
         self.assertRaises(ConcurrencyException,
             ModelsqlTimestamp.delete, [record])
 
-        transaction.timestamp[str(record)] = None
-        ModelsqlTimestamp.write([record], {})
-        transaction.commit()
-
         transaction.timestamp.pop(str(record), None)
         ModelsqlTimestamp.write([record], {})
         transaction.commit()