[tryton-debian-vcs] tryton-proteus branch upstream-2.6 updated. upstream/2.6.3-1-ga4ec396

[Mathias Behrle]

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

commit a4ec396b8ec5577b362b5d90b7a4b0bc64d8d5a7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:21:00 2014 +0100

    Adding upstream version 2.6.4.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 68e28d2..27dea34 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.4 - 2014-12-03
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.3 - 2014-07-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 8278fb5..96b7c20 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 2.6.3
+Version: 2.6.4
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index 8278fb5..96b7c20 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 2.6.3
+Version: 2.6.4
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 36f2fa9..7ee1c6d 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
 '''
 A library to access Tryton's models like a client.
 '''
-__version__ = "2.6.3"
+__version__ = "2.6.4"
 __all__ = ['Model', 'Wizard']
 import sys
 try:
@@ -783,7 +783,7 @@ class Model(object):
             for record in to_remove:
                 # remove without signal
                 list.remove(getattr(self, field), record)
-            if value and value.get('add') or value.get('update'):
+            if value and (value.get('add') or value.get('update')):
                 for vals in value.get('add', []):
                     relation = Model.get(self._fields[field]['relation'],
                             self._config)
-- 
tryton-proteus