[tryton-debian-vcs] tryton-server branch upstream updated. upstream/3.0.0-1-g60c22fa

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/3.0.0-1-g60c22fa

commit 60c22fa8a4d9233e48341975f402a45cb101634e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 12:58:01 2013 +0100

    Adding upstream version 3.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index ae9f454..8ab9272 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.1 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.0 - 2013-10-21
 * Bug fixes (see mercurial logs for details)
 * Allow customization of translation in po files
diff --git a/PKG-INFO b/PKG-INFO
index 44f1a41..3a366aa 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.0.0
+Version: 3.0.1
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 44f1a41..3a366aa 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.0.0
+Version: 3.0.1
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py
index b3fbcfa..3f81ca8 100644
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -994,7 +994,9 @@ class ModelSQL(ModelStorage):
                 cursor.execute(*history.select(history.id, history.write_date,
                         where=where
                         & (history.write_date != None)
-                        & (history.create_date == None)))
+                        & (history.create_date == None)
+                        & (history.write_date
+                            <= transaction.context['_datetime'])))
                 for deleted_id, delete_date in cursor.fetchall():
                     if ids_date[deleted_id] < delete_date:
                         to_delete.add(deleted_id)
diff --git a/trytond/res/user.py b/trytond/res/user.py
index 2cd6e6d..e50c8fd 100644
--- a/trytond/res/user.py
+++ b/trytond/res/user.py
@@ -342,13 +342,13 @@ class User(ModelSQL, ModelView):
         key = (Transaction().user, context_only)
         preferences = cls._get_preferences_cache.get(key)
         if preferences is not None:
-            return preferences
+            return preferences.copy()
         user = Transaction().user
         with Transaction().set_user(0):
             user = cls(user)
         preferences = cls._get_preferences(user, context_only=context_only)
         cls._get_preferences_cache.set(key, preferences)
-        return preferences
+        return preferences.copy()
 
     @classmethod
     def set_preferences(cls, values, old_password=False):
diff --git a/trytond/version.py b/trytond/version.py
index 7f33a34..95e95bc 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "3.0.0"
+VERSION = "3.0.1"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server