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

[FIX] Fix compute_domain method

pull/86/head
Adrien Peiffer (ACSONE) 2015-04-15 09:36:41 +02:00 committed by Stéphane Bidoul
parent 1be717cd68
commit e4b7c467c4
2 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
mis_builder/models/mis_builder.py
View File

@ -572,22 +572,28 @@ class mis_report_instance_period(orm.Model):
'Period name should be unique by report'), 'Period name should be unique by report'),
] ]
# TODO : To adapt to work with expression domain # TODO : To review
def compute_domain(self, cr, uid, ids, account_, context=None): def compute_domain(self, cr, uid, ids, account_, context=None):
if isinstance(ids, (int, long)): if isinstance(ids, (int, long)):
ids = [ids] ids = [ids]
domain = [] domain_list = []
# extract all bal code # extract all bal code
account = _get_account_vars_in_expr(account_) res_vars = {}
account_s = _get_account_vars_in_expr(account_, is_solde=True) domain_mapping = {}
account_i = _get_account_vars_in_expr(account_, is_initial=True) _get_account_vars_in_expr(account_, res_vars, domain_mapping,
is_solde=False, is_initial=False)
all_code = [] for key_domain, account_code in res_vars.iteritems():
all_code.extend([_get_account_code(acc) for acc in account]) key, domain = key_domain
all_code.extend([_get_account_code(acc) for acc in account_s]) partial_domain = [('account_id.code', 'in', list(account_code))]
all_code.extend([_get_account_code(acc) for acc in account_i]) if domain != '':
partial_domain.insert(0, '&')
domain.append(('account_id.code', 'in', all_code)) domain_eval = safe_eval(domain)
partial_domain.extend(domain_eval)
domain_list.extend(partial_domain)
nb_or = len(res_vars) - 1
while nb_or > 0:
domain_list.insert(0, '|')
nb_or -= 1
# compute date/period # compute date/period
period_ids = [] period_ids = []
@ -599,7 +605,7 @@ class mis_report_instance_period(orm.Model):
for c in self.browse(cr, uid, ids, context=context): for c in self.browse(cr, uid, ids, context=context):
target_move = c.report_instance_id.target_move target_move = c.report_instance_id.target_move
if target_move == 'posted': if target_move == 'posted':
domain.append(('move_id.state', '=', target_move)) domain_list.append(('move_id.state', '=', target_move))
if c.period_from: if c.period_from:
compute_period_ids = period_obj.build_ctx_periods( compute_period_ids = period_obj.build_ctx_periods(
cr, uid, c.period_from.id, c.period_to.id) cr, uid, c.period_from.id, c.period_to.id)
@ -611,13 +617,12 @@ class mis_report_instance_period(orm.Model):
date_to = c.date_to date_to = c.date_to
if period_ids: if period_ids:
if date_from: if date_from:
domain.append('|') domain_list.append('|')
domain.append(('period_id', 'in', period_ids)) domain_list.append(('period_id', 'in', period_ids))
if date_from: if date_from:
domain.extend([('date', '>=', c.date_from), domain_list.extend([('date', '>=', c.date_from),
('date', '<=', c.date_to)]) ('date', '<=', c.date_to)])
return domain_list
return domain
def _fetch_account(self, cr, uid, company_id, account_vars, context=None, def _fetch_account(self, cr, uid, company_id, account_vars, context=None,
is_solde=False, is_initial=False): is_solde=False, is_initial=False):

2
mis_builder/static/src/js/mis_builder.js
View File

@ -29,7 +29,7 @@ openerp.mis_builder = function(instance) {
var period_id = JSON.parse($(event.target).data("period-id")); var period_id = JSON.parse($(event.target).data("period-id"));
var period_name = JSON.parse($(event.target).data("period-name")); var period_name = JSON.parse($(event.target).data("period-name"));
var self = this; var self = this;
if (!(val === null) && ((val_c.indexOf('bal_') >=0) || (val_c.indexOf('bals_') >= 0))){ if (!(val === null) && (val_c.indexOf('bal_') >=0)){
new instance.web.Model("mis.report.instance.period").call( new instance.web.Model("mis.report.instance.period").call(
"compute_domain", "compute_domain",
[period_id, val_c], [period_id, val_c],