[tryton-debian-vcs] tryton-modules-product branch upstream-2.6 created. f3f41433c3438d32403f46881b68df1f095a45c6

[Mathias Behrle]

The following commit has been merged in the upstream-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product.git;a=commitdiff;h=f3f41433c3438d32403f46881b68df1f095a45c6
commit f3f41433c3438d32403f46881b68df1f095a45c6
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Oct 17 13:21:30 2013 +0200

    Adding upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index 247d489..e4a6969 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index ede3fac..6e948f6 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
 Copyright (C) 2008-2012 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 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 7e195b3..640092f 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_product
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/tryton.cfg b/tryton.cfg
index 9e6da25..a50a272 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     ir
     res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 2500961..97b6fce 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-product
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module with products
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/uom.py b/uom.py
index e9dfbd3..36a0079 100644
--- a/uom.py
+++ b/uom.py
@@ -123,8 +123,8 @@ class Uom(ModelSQL, ModelView):
     @classmethod
     def search_rec_name(cls, name, clause):
         ids = map(int, cls.search(['OR',
-                    (cls._rec_name,) + clause[1:],
-                    ('symbol',) + clause[1:],
+                    (cls._rec_name,) + tuple(clause[1:]),
+                    ('symbol',) + tuple(clause[1:]),
                     ], order=[]))
         return [('id', 'in', ids)]
 
-- 
tryton-modules-product