[tryton-debian-vcs] tryton-modules-product branch upstream-4.0 updated. upstream/4.0.2-1-gb662e26
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Thu Jan 5 10:52:51 UTC 2017
The following commit has been merged in the upstream-4.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product.git;a=commitdiff;h=upstream/4.0.2-1-gb662e26
commit b662e26d1316bbf64f8fe9edcd06b03a70d5f706
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Jan 4 12:57:29 2017 +0100
Adding upstream version 4.0.3.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/CHANGELOG b/CHANGELOG
index db387bb..cda6e8e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 4.0.3 - 2017-01-03
+* Bug fixes (see mercurial logs for details)
+
Version 4.0.2 - 2016-11-06
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 48f96af..dba4452 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2016 Cédric Krier.
+Copyright (C) 2008-2017 Cédric Krier.
Copyright (C) 2008-2013 Bertrand Chenal.
-Copyright (C) 2008-2016 B2CK SPRL.
+Copyright (C) 2008-2017 B2CK SPRL.
Copyright (C) 2004-2008 Tiny SPRL.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index ea3176a..3f368c9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_product
-Version: 4.0.2
+Version: 4.0.3
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 695114f..834b825 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=4.0.2
+version=4.0.3
depends:
ir
res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 1012186..3fc125b 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.0.2
+Version: 4.0.3
Summary: Tryton module with products
Home-page: http://www.tryton.org/
Author: Tryton
--
tryton-modules-product
More information about the tryton-debian-vcs
mailing list