diff options
| author | atp (Open ERP) <atp@tinyerp.co.in> | 2010-06-22 10:45:44 +0530 |
|---|---|---|
| committer | atp (Open ERP) <atp@tinyerp.co.in> | 2010-06-22 10:45:44 +0530 |
| commit | b0efd26edd9f4e2aa75424b787ea46d2be15cd04 (patch) | |
| tree | e78cdb693e62a5c9a17f77a395eec51fb34becbf /addons/wiki | |
| parent | 46bb1ea51be702758d68a5f69db32c82dbccf9bd (diff) | |
| parent | 2319190c5a20cb8095f85cacca89a33164ba93d7 (diff) | |
[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: atp@tinyerp.co.in-20100622051544-c7hig73zk2at66cy
Diffstat (limited to 'addons/wiki')
| -rw-r--r-- | addons/wiki/wiki_view.xml | 2 | ||||
| -rw-r--r-- | addons/wiki/wizard/wiki_make_index.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml index 05c6fb246fd..5cfd40ada62 100644 --- a/addons/wiki/wiki_view.xml +++ b/addons/wiki/wiki_view.xml @@ -2,7 +2,7 @@ <openerp> <data> <menuitem name="Knowledge Management" icon="terp-stock" - id="base.menu_document" sequence="4" /> + id="base.menu_document" sequence="19" /> <menuitem name="Configuration" id="base.menu_document_configuration" diff --git a/addons/wiki/wizard/wiki_make_index.py b/addons/wiki/wizard/wiki_make_index.py index 24ebf19855e..98cc001fe8c 100644 --- a/addons/wiki/wizard/wiki_make_index.py +++ b/addons/wiki/wizard/wiki_make_index.py @@ -39,8 +39,8 @@ class wiki_make_index(osv.osv_memory): for index_obj in self.browse(cr, uid, ids): wiki_pool = self.pool.get('wiki.wiki') - cr.execute("Select id, section from wiki_wiki where id = ANY(%s) \ - order by section ", (data,)) + cr.execute("Select id, section from wiki_wiki where id IN %s \ + order by section ", (tuple(data),)) lst0 = cr.fetchall() lst = [] s_ids = {} |