[tryton-debian-vcs] tryton-modules-product branch upstream updated. upstream/4.2.0-1-g9f94368

[Mathias Behrle]

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

commit 9f94368dc0bf1031f8a9fff198df796002ed7173
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jan 4 12:56:13 2017 +0100

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

diff --git a/CHANGELOG b/CHANGELOG
index 320db08..0e3441d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.2.1 - 2017-01-03
+* Bug fixes (see mercurial logs for details)
+
 Version 4.2.0 - 2016-11-28
 * Bug fixes (see mercurial logs for details)
 * Add relate from Template to Products
diff --git a/PKG-INFO b/PKG-INFO
index 53ff66c..b36f214 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_product
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/product.py b/product.py
index 79634c1..8a96f7f 100644
--- a/product.py
+++ b/product.py
@@ -164,7 +164,8 @@ class TemplateFunction(fields.Function):
                     }
             else:
                 template = tables['template']
-            return [Column(template, name)]
+            return getattr(Template, name).convert_order(
+                name, tables['template'], Template)
         return order
 
 
diff --git a/tryton.cfg b/tryton.cfg
index 4270a09..fabf0e6 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=4.2.0
+version=4.2.1
 depends:
     ir
     res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 18d665b..b242f01 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-product
-Version: 4.2.0
+Version: 4.2.1
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
-- 
tryton-modules-product