[tryton-debian-vcs] tryton-server branch debian-wheezy-2.6 updated. debian/2.6.14-1-2-gcedf829

[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.14-1-2-gcedf829

commit cedf82998fea6ce04edbb410b1a53c422f12a30b
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:17:08 2014 +0100

    Releasing debian version 2.6.15-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 9274ad3..9f83e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (2.6.15-1) unstable; urgency=medium
+
+  * Merging upstream version 2.6.15.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 04 Dec 2014 19:17:08 +0100
+
 tryton-server (2.6.14-1) unstable; urgency=high
 
   * Merging upstream version 2.6.14.
commit c5fb3b8f11098b4508e43ee36144c670798e9378
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:17:07 2014 +0100

    Merging upstream version 2.6.15.

diff --git a/CHANGELOG b/CHANGELOG
index 34cf985..3375985 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.15 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.14 - 2014-09-29
 * Bug fixes (see mercurial logs for details)
 * Use literal_eval instead of safe_eval (CVE-2014-6633)
diff --git a/PKG-INFO b/PKG-INFO
index e4b72f3..0af8b00 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 2.6.14
+Version: 2.6.15
 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 e4b72f3..0af8b00 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.14
+Version: 2.6.15
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index 69aee4f..9e377f9 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -472,7 +472,9 @@ class ModelView(Model):
         # convert attributes into pyson
         encoder = PYSONEncoder()
         for attr in ('states', 'domain', 'spell', 'colors'):
-            if element.get(attr):
+            if (element.get(attr)
+                    # Avoid double evaluation from inherit with different model
+                    and '__' not in element.get(attr)):
                 element.set(attr, encoder.encode(safe_eval(element.get(attr),
                     CONTEXT)))
 
diff --git a/trytond/pyson.py b/trytond/pyson.py
index c0ce260..e10ffcb 100644
--- a/trytond/pyson.py
+++ b/trytond/pyson.py
@@ -28,25 +28,25 @@ class PYSON(object):
             return Not(self)
 
     def __and__(self, other):
+        if (isinstance(other, PYSON)
+                and other.types() != set([bool])):
+            other = Bool(other)
         if (isinstance(self, And)
                 and not isinstance(self, Or)):
             self._statements.append(other)
             return self
-        if (isinstance(other, PYSON)
-                and other.types() != set([bool])):
-            other = Bool(other)
         if self.types() != set([bool]):
             return And(Bool(self), other)
         else:
             return And(self, other)
 
     def __or__(self, other):
-        if isinstance(self, Or):
-            self._statements.append(other)
-            return self
         if (isinstance(other, PYSON)
                 and other.types() != set([bool])):
             other = Bool(other)
+        if isinstance(self, Or):
+            self._statements.append(other)
+            return self
         if self.types() != set([bool]):
             return Or(Bool(self), other)
         else:
diff --git a/trytond/version.py b/trytond/version.py
index 9372e4e..a6802e4 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.14"
+VERSION = "2.6.15"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server