[tryton-debian-vcs] tryton-server branch debian-jessie-3.2 updated. debian/3.2.17-1-2-g464b790

[Mathias Behrle]

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

commit 464b7906401c81202c0b0724acdb96a8bdac44ea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:25:25 2016 +0100

    Releasing debian version 3.2.18-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 78a4adb..c02f218 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-server (3.2.18-1) unstable; urgency=medium
+
+  * Merging upstream version 3.2.18.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 19 Dec 2016 11:25:25 +0100
+
 tryton-server (3.2.17-1) unstable; urgency=high
 
   * Merging upstream version 3.2.17.
commit 05b1022dee6ae92aa911cf3311097c3f0a9c646e
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Dec 19 11:25:24 2016 +0100

    Merging upstream version 3.2.18.

diff --git a/CHANGELOG b/CHANGELOG
index 30e29ce..c8f3a19 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.18 - 2016-12-17
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.17 - 2016-08-30
 * Bug fixes (see mercurial logs for details)
 * Sanitize path in file_open (CVE-2016-1242)
diff --git a/PKG-INFO b/PKG-INFO
index d10d7e1..000864c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.2.17
+Version: 3.2.18
 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 d10d7e1..000864c 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.17
+Version: 3.2.18
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py
index 17e7079..678cb8b 100644
--- a/trytond/ir/translation.py
+++ b/trytond/ir/translation.py
@@ -944,7 +944,7 @@ class Translation(ModelSQL, ModelView):
                     and translation.overriding_module != module):
                 cls.raise_user_error('translation_overridden', {
                         'name': translation.name,
-                        'name': translation.overriding_module,
+                        'overriding_module': translation.overriding_module,
                         })
             flags = [] if not translation.fuzzy else ['fuzzy']
             trans_ctxt = '%(type)s:%(name)s:' % {
diff --git a/trytond/version.py b/trytond/version.py
index d90fb80..97543dd 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.17"
+VERSION = "3.2.18"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server