[tryton-debian-vcs] tryton-server branch debian-wheezy-2.6 updated. debian/2.6.7-1-2-g99c7d57

[Mathias Behrle]

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

commit 99c7d57172639bbc16489a01bb2dd1d9fa5a2e90
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 19:47:18 2013 +0100

    Releasing debian version 2.6.8-1.

diff --git a/debian/changelog b/debian/changelog
index e1f91e3..0190e28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (2.6.8-1) unstable; urgency=low
+
+  * Merging upstream version 2.6.8.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 11 Dec 2013 19:30:21 +0100
+
 tryton-server (2.6.7-1) unstable; urgency=low
 
   * Merging upstream version 2.6.7.
commit 7d2f1c5df500af71e8a3748fefe1f4bc91d21a64
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 19:22:16 2013 +0100

    Merging upstream version 2.6.8.

diff --git a/CHANGELOG b/CHANGELOG
index 18c70bb..edff9da 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.8 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.7 - 2013-10-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 335248c..72b41cb 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.7
+Version: 2.6.8
 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 335248c..72b41cb 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.7
+Version: 2.6.8
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/error.py b/trytond/error.py
index 33efe8e..0f9ed1c 100644
--- a/trytond/error.py
+++ b/trytond/error.py
@@ -38,7 +38,7 @@ class WarningErrorMixin(object):
         if res:
             error = res
 
-        if error_args:
+        if error_args is not None:
             try:
                 error = error % error_args
             except TypeError:
diff --git a/trytond/ir/lang.py b/trytond/ir/lang.py
index 881c47d..56b4b41 100644
--- a/trytond/ir/lang.py
+++ b/trytond/ir/lang.py
@@ -62,9 +62,9 @@ class Lang(ModelSQL, ModelView):
 
     @classmethod
     def search_rec_name(cls, name, clause):
-        langs = cls.search([('code',) + clause[1:]], order=[])
+        langs = cls.search([('code',) + tuple(clause[1:])], order=[])
         if langs:
-            langs += cls.search([('name',) + clause[1:]], order=[])
+            langs += cls.search([('name',) + tuple(clause[1:])], order=[])
             return [('id', 'in', [l.id for l in langs])]
         return [('name',) + tuple(clause[1:])]
 
diff --git a/trytond/model/modelstorage.py b/trytond/model/modelstorage.py
index 9bcbac2..7556f70 100644
--- a/trytond/model/modelstorage.py
+++ b/trytond/model/modelstorage.py
@@ -1374,6 +1374,8 @@ class EvalEnvironment(dict):
                 or item in self._model._inherit_fields):
             value = getattr(self._record, item)
             if isinstance(value, Model):
+                if self._model._fields[item]._type == 'reference':
+                    return str(value)
                 return value.id
             elif isinstance(value, (list, tuple)):
                 return [r.id for r in value]
diff --git a/trytond/res/user.py b/trytond/res/user.py
index 7e80264..0c4ebf1 100644
--- a/trytond/res/user.py
+++ b/trytond/res/user.py
@@ -338,13 +338,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 e80852b..0434b1a 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 = "2.6.7"
+VERSION = "2.6.8"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server