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] mis_builder: fix sum aggregation of non-stored field in non-accounting queries 

fixes #178
pull/189/head
Stéphane Bidoul 2016-05-15 22:21:31 +02:00
parent 222874d4f6
commit a812c15447
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mis_builder/models/mis_report.py
View File

@ -816,15 +816,23 @@ class MisReport(models.Model):
domain.extend([(query.date_field.name, '>=', datetime_from), domain.extend([(query.date_field.name, '>=', datetime_from),
(query.date_field.name, '<', datetime_to)]) (query.date_field.name, '<', datetime_to)])
field_names = [f.name for f in query.field_ids] field_names = [f.name for f in query.field_ids]
all_stored = all([model._fields[f].store for f in field_names])
if not query.aggregate: if not query.aggregate:
data = model.search_read(domain, field_names) data = model.search_read(domain, field_names)
res[query.name] = [AutoStruct(**d) for d in data] res[query.name] = [AutoStruct(**d) for d in data]
elif query.aggregate == 'sum': elif query.aggregate == 'sum' and all_stored:
# use read_group to sum stored fields
data = model.read_group( data = model.read_group(
domain, field_names, []) domain, field_names, [])
s = AutoStruct(count=data[0]['__count']) s = AutoStruct(count=data[0]['__count'])
for field_name in field_names: for field_name in field_names:
v = data[0][field_name] try:
v = data[0][field_name]
except KeyError:
_logger.error('field %s not found in read_group '
'for %s; not summable?',
field_name, model._name)
v = AccountingNone
setattr(s, field_name, v) setattr(s, field_name, v)
res[query.name] = s res[query.name] = s
else: else:
@ -836,6 +844,8 @@ class MisReport(models.Model):
agg = _max agg = _max
elif query.aggregate == 'avg': elif query.aggregate == 'avg':
agg = _avg agg = _avg
elif query.aggregate == 'sum':
agg = _sum
for field_name in field_names: for field_name in field_names:
setattr(s, field_name, setattr(s, field_name,
agg([d[field_name] for d in data])) agg([d[field_name] for d in data]))