[tryton-debian-vcs] tryton-server branch debian-jessie-3.2 updated. debian/3.2.3-1-3-gc726c19

[Mathias Behrle]

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

commit c726c193a1791c5cd8e408c809b8fb92f320b751
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:47:24 2014 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 1c0427c..0cca8a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-server (3.2.4-1) unstable; urgency=medium
+
+  * Setting the branch in the watch file to the fixed version 3.2.
+  * Merging upstream version 3.2.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 12 Nov 2014 13:47:24 +0100
+
 tryton-server (3.2.3-1) unstable; urgency=high
 
   * Adding actual upstream signing key.
commit e37d1009401089d0c87c4d569705f72448a6abdb
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Nov 12 13:47:24 2014 +0100

    Merging upstream version 3.2.4.

diff --git a/CHANGELOG b/CHANGELOG
index be6f898..63fa37d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.4 - 2014-11-06
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.3 - 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 40f97fa..096e74b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.2.3
+Version: 3.2.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 40f97fa..096e74b 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.2.3
+Version: 3.2.4
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index ae853e2..4847a4e 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -426,7 +426,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/protocols/dispatcher.py b/trytond/protocols/dispatcher.py
index 2d1915d..27ca1a6 100644
--- a/trytond/protocols/dispatcher.py
+++ b/trytond/protocols/dispatcher.py
@@ -23,7 +23,7 @@ from trytond.rpc import RPC
 
 ir_configuration = Table('ir_configuration')
 ir_lang = Table('ir_lang')
-ir_module = Table('ir_module')
+ir_module = Table('ir_module_module')
 res_user = Table('res_user')
 
 
diff --git a/trytond/pyson.py b/trytond/pyson.py
index 6771f20..bab351c 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 063c087..edb38b1 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.2.3"
+VERSION = "3.2.4"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server