Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[IMP] mis_builder: get_aml_domain_for_expr OR domains

pull/86/head
Stéphane Bidoul 2015-04-23 17:14:08 +02:00
parent dd5084fb28
commit 76ea800265
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mis_builder/models/aep.py
View File

@ -1,5 +1,6 @@
import re import re
from collections import defaultdict from collections import defaultdict
from openerp.osv import expression
class AccountingExpressionProcessor(object): class AccountingExpressionProcessor(object):
@ -138,11 +139,6 @@ class AccountingExpressionProcessor(object):
Returns a domain that can be used to search on account.move.line. Returns a domain that can be used to search on account.move.line.
""" """
def or_domains(self, domains):
""" convert a list of domain into one domain OR'ing the domains """
# TODO
return []
domains = [] domains = []
for mo in self.ACC_RE.finditer(expr): for mo in self.ACC_RE.finditer(expr):
field, mode, account_codes, domain = self._parse_mo(mo) field, mode, account_codes, domain = self._parse_mo(mo)
@ -157,8 +153,8 @@ class AccountingExpressionProcessor(object):
elif field == 'deb': elif field == 'deb':
domain.append(('debit', '>', 0)) domain.append(('debit', '>', 0))
domain.extend(domain) domain.extend(domain)
domains.append(domain) domains.append(expression.normalize_domain(domain))
return or_domains(domains) return expression.OR(domains)
def do_queries(self, period_domain, period_domain_i, period_domain_e): def do_queries(self, period_domain, period_domain_i, period_domain_e):
aml_model = self.env['account.move.line'] aml_model = self.env['account.move.line']