[tryton-debian-vcs] tryton-server branch debian updated. debian/3.0.3-1-2-ga86f2d2

[Mathias Behrle]

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

commit a86f2d266467ec3922584bae6da5cbfd688405dc
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 16 18:10:37 2014 +0200

    Releasing debian version 3.0.4-1.

diff --git a/debian/changelog b/debian/changelog
index f085921..4c86612 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (3.0.4-1) unstable; urgency=medium
+
+  * Merging upstream version 3.0.4.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 16 Apr 2014 15:11:11 +0200
+
 tryton-server (3.0.3-1) unstable; urgency=medium
 
   * Adding the tryton user to the ssl-cert group on fresh installs.
commit efb7a3e1d2435a8e05f047a4a8310c1736f98de6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 16 14:49:25 2014 +0200

    Merging upstream version 3.0.4.

diff --git a/CHANGELOG b/CHANGELOG
index 86ffc80..186ace0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.4 - 2014-04-07
+* Bug fixes (see mercurial logs for details)
+
 Version 3.0.3 - 2014-03-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 2d31743..52c4611 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.0.3
+Version: 3.0.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 2d31743..52c4611 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.3
+Version: 3.0.4
 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 aa64ca2..4a47616 100644
--- a/trytond/model/fields/field.py
+++ b/trytond/model/fields/field.py
@@ -262,7 +262,8 @@ class FieldTranslate(Field):
         language = Transaction().language
         if Model.__name__ == 'ir.model':
             return table.join(translation, 'LEFT',
-                condition=(translation.name == Concat(table.model, name))
+                condition=(translation.name == Concat(Concat(
+                            table.model, ','), name))
                 & (translation.res_id == -1)
                 & (translation.lang == language)
                 & (translation.type == 'model')
diff --git a/trytond/transaction.py b/trytond/transaction.py
index 9552b4a..be6ebea 100644
--- a/trytond/transaction.py
+++ b/trytond/transaction.py
@@ -106,7 +106,8 @@ class Transaction(local):
     def set_context(self, context=None, **kwargs):
         if context is None:
             context = {}
-        manager = _AttributeManager(context=self.context.copy())
+        manager = _AttributeManager(context=self.context)
+        self.context = self.context.copy()
         self.context.update(context)
         if kwargs:
             self.context.update(kwargs)
diff --git a/trytond/version.py b/trytond/version.py
index 08eb75c..d6a2ba0 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.3"
+VERSION = "3.0.4"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server