[tryton-debian-vcs] tryton-server branch debian-jessie-3.0 updated. debian/3.0.4-1-4-gd36d77f

[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.4-1-4-gd36d77f

commit d36d77fc7ff84fb231a7f75bfedcab1dbddfe700
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 2 14:16:30 2014 +0200

    Releasing debian version 3.0.5-1.

diff --git a/debian/changelog b/debian/changelog
index 4c86612..a744e3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-server (3.0.5-1) unstable; urgency=medium
+
+  * Setting the branch in the watch file to the fixed version 3.0.
+  * Updating signing key while using now plain .asc files instead of .pgp
+    binaries.
+  * Merging upstream version 3.0.5.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 02 Jul 2014 14:16:30 +0200
+
 tryton-server (3.0.4-1) unstable; urgency=medium
 
   * Merging upstream version 3.0.4.
commit 4a526b5246f9fa6fb2d549839a571e0d9105952d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 2 14:16:28 2014 +0200

    Merging upstream version 3.0.5.

diff --git a/CHANGELOG b/CHANGELOG
index 186ace0..bc534f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.5 - 2014-07-01
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.4 - 2014-04-07
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 52c4611..7dce04a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.0.4
+Version: 3.0.5
 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 52c4611..7dce04a 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.4
+Version: 3.0.5
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/model/fields/field.py b/trytond/model/fields/field.py
index 4a47616..7ad848c 100644
--- a/trytond/model/fields/field.py
+++ b/trytond/model/fields/field.py
@@ -330,11 +330,22 @@ class FieldTranslate(Field):
             model = IrModel.__table__()
             join = self.__get_translation_join(Model, name,
                 translation, model, table)
-            tables[key] = {
-                None: (join.right, join.condition),
-                }
+            if join.left == table:
+                tables[key] = {
+                    None: (join.right, join.condition),
+                    }
+            else:
+                tables[key] = {
+                    None: (join.left.right, join.left.condition),
+                    'translation': {
+                        None: (join.right, join.condition),
+                        },
+                    }
         else:
-            translation, _ = tables[key][None]
+            if 'translation' not in tables[key]:
+                translation, _ = tables[key][None]
+            else:
+                translation, _ = tables[key]['translation'][None]
 
         return [Coalesce(NullIf(translation.value, ''), Column(table, name))]
 
diff --git a/trytond/model/model.py b/trytond/model/model.py
index d105038..5f43ae6 100644
--- a/trytond/model/model.py
+++ b/trytond/model/model.py
@@ -315,7 +315,7 @@ class Model(WarningErrorMixin, URLMixin, PoolBase):
                 res[field]['delete'] = accesses.get(field, {}).get('delete',
                     True)
             if res[field]['type'] == 'one2many' \
-                    and hasattr(cls._fields[field], 'field'):
+                    and getattr(cls._fields[field], 'field', None):
                 res[field]['relation_field'] = copy.copy(
                         cls._fields[field].field)
             if res[field]['type'] in ('datetime', 'time'):
diff --git a/trytond/protocols/jsonrpc.py b/trytond/protocols/jsonrpc.py
index 201ba41..4011a52 100644
--- a/trytond/protocols/jsonrpc.py
+++ b/trytond/protocols/jsonrpc.py
@@ -305,7 +305,7 @@ class SimpleJSONRPCServer(SocketServer.TCPServer,
 
     def server_close(self):
         SocketServer.TCPServer.server_close(self)
-        for handler in self.handlers:
+        for handler in self.handlers.copy():
             self.shutdown_request(handler.request)
 
     if sys.version_info[:2] <= (2, 6):
diff --git a/trytond/protocols/xmlrpc.py b/trytond/protocols/xmlrpc.py
index 5e13d7d..fd283ac 100644
--- a/trytond/protocols/xmlrpc.py
+++ b/trytond/protocols/xmlrpc.py
@@ -202,7 +202,7 @@ class SimpleThreadedXMLRPCServer(SocketServer.ThreadingMixIn,
 
     def server_close(self):
         SimpleXMLRPCServer.SimpleXMLRPCServer.server_close(self)
-        for handler in self.handlers:
+        for handler in self.handlers.copy():
             self.shutdown_request(handler.request)
 
     if sys.version_info[:2] <= (2, 6):
diff --git a/trytond/version.py b/trytond/version.py
index d6a2ba0..f02a4fc 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.4"
+VERSION = "3.0.5"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server