[tryton-debian-vcs] tryton-server branch upstream-2.8 updated. upstream/2.8.3-1-g188bf88

[Mathias Behrle]

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

commit 188bf8838e691327dd9dcfa8aa59c5ea2437143c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Dec 11 18:28:07 2013 +0100

    Adding upstream version 2.8.4.

diff --git a/CHANGELOG b/CHANGELOG
index 5bb11f4..b1b1044 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.4 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.3 - 2013-10-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 94492f8..b199d0d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.8.3
+Version: 2.8.4
 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 94492f8..b199d0d 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.8.3
+Version: 2.8.4
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/error.py b/trytond/error.py
index 0dc4a60..32cee1b 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 9a77288..b8bf92d 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/ir/rule.py b/trytond/ir/rule.py
index 496b1a5..0c93ea3 100644
--- a/trytond/ir/rule.py
+++ b/trytond/ir/rule.py
@@ -131,7 +131,7 @@ class Rule(ModelSQL, ModelView):
             try:
                 value = safe_eval(rule.domain, ctx)
             except Exception:
-                return False
+                cls.raise_user_error('invalid_domain', (rule.rec_name,))
             if not isinstance(value, list):
                 cls.raise_user_error('invalid_domain', (rule.rec_name,))
             else:
diff --git a/trytond/model/modelstorage.py b/trytond/model/modelstorage.py
index b2e8cc4..0a414a9 100644
--- a/trytond/model/modelstorage.py
+++ b/trytond/model/modelstorage.py
@@ -1409,6 +1409,8 @@ class EvalEnvironment(dict):
         if item in self._model._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 6c1f08c..516f833 100644
--- a/trytond/res/user.py
+++ b/trytond/res/user.py
@@ -339,13 +339,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 29a1e41..0abfb88 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.8.3"
+VERSION = "2.8.4"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server