[tryton-debian-vcs] tryton-server branch upstream updated. upstream/3.2.1-1-g1395fe6

[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.2.1-1-g1395fe6

commit 1395fe64cd555fc221f2b9ae26049cd31d900c73
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 26 14:33:35 2014 +0200

    Adding upstream version 3.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index 0d867f8..c4d13ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2014-08-03
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.1 - 2014-07-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 52c6587..f73a93f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.2.1
+Version: 3.2.2
 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 52c6587..f73a93f 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.1
+Version: 3.2.2
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/fields/many2many.py b/trytond/model/fields/many2many.py
index 03e6b09..f037eaa 100644
--- a/trytond/model/fields/many2many.py
+++ b/trytond/model/fields/many2many.py
@@ -243,6 +243,7 @@ class Many2Many(Field):
         Target = self.get_target()
         table, _ = tables[None]
         name, operator, ids = domain
+        ids = list(ids)  # Ensure it is a list for concatenation
 
         def get_child(ids):
             if not ids:
diff --git a/trytond/model/fields/many2one.py b/trytond/model/fields/many2one.py
index e180475..ef109d0 100644
--- a/trytond/model/fields/many2one.py
+++ b/trytond/model/fields/many2one.py
@@ -115,6 +115,7 @@ class Many2One(Field):
         Target = self.get_target()
         table, _ = tables[None]
         name, operator, ids = domain
+        ids = list(ids)  # Ensure it is a list for concatenation
 
         def get_child(ids):
             if not ids:
diff --git a/trytond/model/fields/numeric.py b/trytond/model/fields/numeric.py
index 359a6a0..2a8dda3 100644
--- a/trytond/model/fields/numeric.py
+++ b/trytond/model/fields/numeric.py
@@ -49,6 +49,6 @@ class Numeric(Float):
             type_ = self.sql_type().base
             if operator in ('in', 'not in'):
                 return [Cast(Literal(v), type_) for v in value]
-            else:
+            elif value is not None:
                 return Cast(Literal(value), type_)
         return value
diff --git a/trytond/modules/__init__.py b/trytond/modules/__init__.py
index f954fb5..e7ee406 100644
--- a/trytond/modules/__init__.py
+++ b/trytond/modules/__init__.py
@@ -366,6 +366,7 @@ def load_modules(database_name, pool, update=False, lang=None):
     res = True
 
     def _load_modules():
+        global res
         cursor = Transaction().cursor
         if update:
             # Migration from 2.2: workflow module removed
diff --git a/trytond/protocols/xmlrpc.py b/trytond/protocols/xmlrpc.py
index 0625f1e..a5bbe2c 100644
--- a/trytond/protocols/xmlrpc.py
+++ b/trytond/protocols/xmlrpc.py
@@ -55,7 +55,7 @@ def dump_time(self, value, write):
 
 xmlrpclib.Marshaller.dispatch[Decimal] = dump_decimal
 xmlrpclib.Marshaller.dispatch[type(None)] = \
-        lambda self, value, write: self.dump_bool(bool(value), write)
+        lambda self, value, write: write("<value><nil/></value>")
 xmlrpclib.Marshaller.dispatch[datetime.date] = dump_date
 xmlrpclib.Marshaller.dispatch[datetime.time] = dump_time
 xmlrpclib.Marshaller.dispatch[buffer] = dump_buffer
diff --git a/trytond/tests/run-tests.py b/trytond/tests/run-tests.py
index 13bbd88..f576c34 100755
--- a/trytond/tests/run-tests.py
+++ b/trytond/tests/run-tests.py
@@ -6,6 +6,7 @@ import argparse
 import os
 import time
 import unittest
+import sys
 
 from trytond.config import CONFIG
 
@@ -39,4 +40,5 @@ if not opt.modules:
     suite = all_suite(opt.tests)
 else:
     suite = modules_suite(opt.tests)
-unittest.TextTestRunner(verbosity=opt.verbosity).run(suite)
+result = unittest.TextTestRunner(verbosity=opt.verbosity).run(suite)
+sys.exit(not result.wasSuccessful())
diff --git a/trytond/version.py b/trytond/version.py
index 19a6cdd..4faba9c 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.1"
+VERSION = "3.2.2"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server