[tryton-debian-vcs] tryton-server branch debian-jessie-3.0 updated. debian/3.0.5-1-2-g1107ed5

[Mathias Behrle]

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

commit 1107ed511cdafb800b8f25c37f32c61d296d6228
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 26 14:44:22 2014 +0200

    Releasing debian version 3.0.6-1.

diff --git a/debian/changelog b/debian/changelog
index a744e3b..4ec473f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (3.0.6-1) unstable; urgency=medium
+
+  * Merging upstream version 3.0.6.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 26 Aug 2014 14:44:22 +0200
+
 tryton-server (3.0.5-1) unstable; urgency=medium
 
   * Setting the branch in the watch file to the fixed version 3.0.
commit 73991bace7b815bd3771c7a397057a347fad38e4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Aug 26 14:44:20 2014 +0200

    Merging upstream version 3.0.6.

diff --git a/CHANGELOG b/CHANGELOG
index bc534f5..0662f72 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.6 - 2014-08-03
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.5 - 2014-07-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 7dce04a..dc47e60 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.0.5
+Version: 3.0.6
 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 7dce04a..dc47e60 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.0.5
+Version: 3.0.6
 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 8a94044..958853c 100644
--- a/trytond/model/fields/many2many.py
+++ b/trytond/model/fields/many2many.py
@@ -242,6 +242,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 84f5621..114d208 100644
--- a/trytond/model/fields/many2one.py
+++ b/trytond/model/fields/many2one.py
@@ -114,6 +114,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/protocols/xmlrpc.py b/trytond/protocols/xmlrpc.py
index fd283ac..f96d936 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/version.py b/trytond/version.py
index f02a4fc..4f845a5 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.0.5"
+VERSION = "3.0.6"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server