[tryton-debian-vcs] tryton-modules-product branch upstream-2.2 created. 2b6d2b3166018fb0d535f5fdb54388043ee09101

[Mathias Behrle]

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

    Adding upstream version 2.2.3.

diff --git a/CHANGELOG b/CHANGELOG
index 1fdc4b4..c7722c4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.3 - 2013-10-01
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.2 - 2012-09-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 83c0f58..244bb5d 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-2011 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 9b9e8ae..5b612a7 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_product
-Version: 2.2.2
+Version: 2.2.3
 Summary: Define products, categories of product, units of measure, categories of units of measure.
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 462de08..43d821e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
     'name_fr_FR': 'Produit',
     'name_nl_NL': 'Producten',
     'name_ru_RU': 'ТМЦ',
-    'version': '2.2.2',
+    'version': '2.2.3',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 267915e..9aa4c1f 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.2.2
+Version: 2.2.3
 Summary: Define products, categories of product, units of measure, categories of units of measure.
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/uom.py b/uom.py
index 9d6d957..358dce0 100644
--- a/uom.py
+++ b/uom.py
@@ -127,8 +127,8 @@ class Uom(ModelSQL, ModelView):
 
     def search_rec_name(self, name, clause):
         ids = self.search(['OR',
-            (self._rec_name,) + clause[1:],
-            ('symbol',) + clause[1:],
+            (self._rec_name,) + tuple(clause[1:]),
+            ('symbol',) + tuple(clause[1:]),
             ], order=[])
         return [('id', 'in', ids)]
 
commit 7ccb7d8a89326e7984838f2fb852e8cfe0408a49
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Sep 12 15:45:18 2012 +0200

    Adding upstream version 2.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index 3ac4344..1fdc4b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.1 - 2011-12-26
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index a9feb41..83c0f58 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2012 Cédric Krier.
 Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 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 61b54f3..9b9e8ae 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
 Name: trytond_product
-Version: 2.2.1
+Version: 2.2.2
 Summary: Define products, categories of product, units of measure, categories of units of measure.
 Home-page: http://www.tryton.org/
 Author: B2CK
diff --git a/__tryton__.py b/__tryton__.py
index 94e1f65..462de08 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -10,7 +10,7 @@
     'name_fr_FR': 'Produit',
     'name_nl_NL': 'Producten',
     'name_ru_RU': 'ТМЦ',
-    'version' : '2.2.1',
+    'version': '2.2.2',
     'author' : 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/tests/test_product.py b/tests/test_product.py
index 753e24d..c3f5f9d 100644
--- a/tests/test_product.py
+++ b/tests/test_product.py
@@ -64,17 +64,17 @@ class ProductTestCase(unittest.TestCase):
                 })
             transaction.cursor.commit()
 
-            self.failUnlessRaises(Exception, self.uom.write, {
+            self.failUnlessRaises(Exception, self.uom.write, uom_id, {
                 'rate': 0.0,
                 })
             transaction.cursor.rollback()
 
-            self.failUnlessRaises(Exception, self.uom.write, {
+            self.failUnlessRaises(Exception, self.uom.write, uom_id, {
                 'factor': 0.0,
                 })
             transaction.cursor.rollback()
 
-            self.failUnlessRaises(Exception, self.uom.write, {
+            self.failUnlessRaises(Exception, self.uom.write, uom_id, {
                 'rate': 0.0,
                 'factor': 0.0,
                 })
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index 530b678..267915e 100644
--- a/trytond_product.egg-info/PKG-INFO
+++ b/trytond_product.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.1
+Metadata-Version: 1.0
 Name: trytond-product
-Version: 2.2.1
+Version: 2.2.2
 Summary: Define products, categories of product, units of measure, categories of units of measure.
 Home-page: http://www.tryton.org/
 Author: B2CK
-- 
tryton-modules-product