[tryton-debian-vcs] tryton-modules-product branch debian updated. debian/4.2.0-1-2-gece8eb5

[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-modules-product.git;a=commitdiff;h=debian/4.2.0-1-2-gece8eb5

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

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

diff --git a/debian/changelog b/debian/changelog
index 3e7fe29..9a7ac58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tryton-modules-product (4.2.1-1) unstable; urgency=medium
+
+  * Merging upstream version 4.2.1.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Wed, 04 Jan 2017 12:56:14 +0100
+
 tryton-modules-product (4.2.0-1) unstable; urgency=medium
 
   * Merging upstream version 4.2.0.
commit e839f3fb1538feb995fed19c45364de1a2a4bcea
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jan 4 12:56:14 2017 +0100

    Merging upstream version 4.2.1.

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