Fix domain concatenation between list and tuple
(transplanted from a4a8b60d192f53fce094e81390736316f72a0089)
This commit is contained in:
1 parent
b50738c2c8
commit
12d6362540
1 file changed
+8
-8
+8
-8
@@ -390,11 +390,11 @@ class AccountTemplate(ModelSQL, ModelView):
|
||||
@classmethod
|
||||
def search_rec_name(cls, name, clause):
|
||||
templates = cls.search([
|
||||
('code',) + clause[1:],
|
||||
('code',) + tuple(clause[1:]),
|
||||
], limit=1)
|
||||
if templates:
|
||||
return [('code',) + clause[1:]]
|
||||
return [(cls._rec_name,) + clause[1:]]
|
||||
return [('code',) + tuple(clause[1:])]
|
||||
return [(cls._rec_name,) + tuple(clause[1:])]
|
||||
|
||||
def _get_account_value(self, account=None):
|
||||
'''
|
||||
@@ -830,11 +830,11 @@ class Account(ModelSQL, ModelView):
|
||||
@classmethod
|
||||
def search_rec_name(cls, name, clause):
|
||||
accounts = cls.search([
|
||||
('code',) + clause[1:],
|
||||
('code',) + tuple(clause[1:]),
|
||||
], limit=1)
|
||||
if accounts:
|
||||
return [('code',) + clause[1:]]
|
||||
return [(cls._rec_name,) + clause[1:]]
|
||||
return [('code',) + tuple(clause[1:])]
|
||||
return [(cls._rec_name,) + tuple(clause[1:])]
|
||||
|
||||
@classmethod
|
||||
def copy(cls, accounts, default=None):
|
||||
@@ -1001,8 +1001,8 @@ class AccountDeferral(ModelSQL, ModelView):
|
||||
@classmethod
|
||||
def search_rec_name(cls, name, clause):
|
||||
deferrals = cls.search(['OR',
|
||||
('account.rec_name',) + clause[1:],
|
||||
('fiscalyear.rec_name',) + clause[1:],
|
||||
('account.rec_name',) + tuple(clause[1:]),
|
||||
('fiscalyear.rec_name',) + tuple(clause[1:]),
|
||||
])
|
||||
return [('id', 'in', [d.id for d in deferrals])]
|
||||
|
||||
|
||||
Reference in new issue
Block a user