[tryton-debian-vcs] tryton-modules-product branch debian-jessie-2.8 updated. debian/2.8.1-1-4-g4b0cbae
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Dec 11 18:09:41 UTC 2013
The following commit has been merged in the debian-jessie-2.8 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-product.git;a=commitdiff;h=debian/2.8.1-1-4-g4b0cbae
commit 4b0cbae0679df90216313d00d336875bf41d10ac
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 11 19:08:21 2013 +0100
Releasing debian version 2.8.2-1.
diff --git a/debian/changelog b/debian/changelog
index 411cc08..f81675b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-product (2.8.2-1) unstable; urgency=low
+
+ * Removing inadvertently commited .pc directory.
+ * Fixing the branch version in the watch file.
+ * Merging upstream version 2.8.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 11 Dec 2013 18:42:46 +0100
+
tryton-modules-product (2.8.1-1) unstable; urgency=low
* Merging upstream version 2.8.1.
commit d6e3bcb11e88c234377c23f76af76ed7bc706a58
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Dec 11 18:29:10 2013 +0100
Merging upstream version 2.8.2.
diff --git a/CHANGELOG b/CHANGELOG
index 28df943..2c30339 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.8.2 - 2013-12-04
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.1 - 2013-10-01
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index 7b95c39..70608a9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond_product
-Version: 2.8.1
+Version: 2.8.2
Summary: Tryton module with products
Home-page: http://www.tryton.org/
Author: Tryton
diff --git a/product.py b/product.py
index b99a117..12c4c81 100644
--- a/product.py
+++ b/product.py
@@ -152,12 +152,12 @@ class Product(ModelSQL, ModelView):
@classmethod
def search_rec_name(cls, name, clause):
- ids = map(int, cls.search([('code',) + clause[1:]], order=[]))
+ ids = map(int, cls.search([('code',) + tuple(clause[1:])], order=[]))
if ids:
- ids += map(int, cls.search([('template.name',) + clause[1:]],
- order=[]))
+ ids += map(int,
+ cls.search([('template.name',) + tuple(clause[1:])], order=[]))
return [('id', 'in', ids)]
- return [('template.name',) + clause[1:]]
+ return [('template.name',) + tuple(clause[1:])]
def get_default_uom(self, name):
return self.template.default_uom.id
@@ -209,7 +209,9 @@ class Product(ModelSQL, ModelView):
field = arg[0].split('.', 1)[0]
if not getattr(cls, field, None):
field = 'template.' + arg[0]
- result.append((field,) + tuple(arg[1:]))
+ result.append((field,) + tuple(arg[1:]))
+ else:
+ result.append(arg)
elif isinstance(arg, list):
# sub-domain
result.append(convert_domain(arg))
diff --git a/tryton.cfg b/tryton.cfg
index af2ad81..a0e2fe7 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.1
+version=2.8.2
depends:
ir
res
diff --git a/trytond_product.egg-info/PKG-INFO b/trytond_product.egg-info/PKG-INFO
index f4c6de5..44fd489 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: 2.8.1
+Version: 2.8.2
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