summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Pinckaers <fp@tinyerp.com>2009-04-06 17:55:31 +0200
committerFabien Pinckaers <fp@tinyerp.com>2009-04-06 17:55:31 +0200
commite5e85e31eb7cd67f604deda34582dcc792f20101 (patch)
tree754dafe6bad0487362001b87d0731c7727f69589
parentdc36721e9977c1a4b37ade684ea46a8b422ed762 (diff)
bugfix_351000
bzr revid: fp@tinyerp.com-20090406155531-hkyl0ktyo35bsyro
-rw-r--r--addons/account/account.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/account/account.py b/addons/account/account.py
index e8574f61590..da054fc84af 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -148,10 +148,10 @@ class account_account(osv.osv):
continue
jour = self.pool.get('account.journal').browse(cr, uid, args[pos][2])
if (not (jour.account_control_ids or jour.type_control_ids)) or not args[pos][2]:
- del args[pos]
+ args[pos] = ('type','not in',('consolidation','view'))
continue
- ids3 = map(lambda x: x.code, jour.type_control_ids)
- ids1 = super(account_account, self).search(cr, uid, [('type', 'in', ids3)])
+ ids3 = map(lambda x: x.id, jour.type_control_ids)
+ ids1 = super(account_account, self).search(cr, uid, [('user_type', 'in', ids3)])
ids1 += map(lambda x: x.id, jour.account_control_ids)
args[pos] = ('id', 'in', ids1)
pos += 1