[tryton-debian-vcs] tryton-modules-company branch upstream-2.2 created. c8da58c1e8e6ff1339c171acbd690bf8990e6309

[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-company.git;a=commitdiff;h=c8da58c1e8e6ff1339c171acbd690bf8990e6309
commit c8da58c1e8e6ff1339c171acbd690bf8990e6309
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Feb 24 19:46:15 2013 +0100

    Adding upstream version 2.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index f9fcbce..d6e6ac2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.2 - 2012-12-23
+* 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 3d2324b..26f578f 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.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index e7fab0f..3573a16 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_company
-Version: 2.2.1
+Version: 2.2.2
 Summary: Define company and employee.
 Add main and current company on users preferences.
 Add company on properties.
diff --git a/__tryton__.py b/__tryton__.py
index 10fabc3..4f592d2 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
     'name_es_ES': 'Empresa',
     'name_fr_FR': 'Société',
     'name_nl_NL': 'Bedrijf',
-    'version': '2.2.1',
+    'version': '2.2.2',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/company.py b/company.py
index 6e15d19..1102651 100644
--- a/company.py
+++ b/company.py
@@ -225,11 +225,12 @@ class Property(ModelSQL, ModelView):
             res['company'] = user.company.id
         return res
 
-    def search(self, domain, offset=0, limit=None, order=None, count=False):
+    def search(self, domain, offset=0, limit=None, order=None, count=False,
+            query_string=False):
         if Transaction().user == 0 and not 'user' in Transaction().context:
             domain = ['AND', domain[:], ('company', '=', False)]
-        return super(Property, self).search(domain, offset=offset,
-                limit=limit, order=order, count=count)
+        return super(Property, self).search(domain, offset=offset, limit=limit,
+            order=order, count=count, query_string=query_string)
 
 Property()
 
diff --git a/trytond_company.egg-info/PKG-INFO b/trytond_company.egg-info/PKG-INFO
index 57ff09b..fa23cae 100644
--- a/trytond_company.egg-info/PKG-INFO
+++ b/trytond_company.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-company
-Version: 2.2.1
+Version: 2.2.2
 Summary: Define company and employee.
 Add main and current company on users preferences.
 Add company on properties.
-- 
tryton-modules-company