cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bbmaster' of ssh://git.cy55.de/home/hplattner/git/cybertools into bbmaster

Browse source
This commit is contained in:
Helmut Merz 2013-12-20 10:10:52 +01:00
commit e07bcefe0c
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
composer/report/result.py
View file

@ -177,7 +177,8 @@ class ResultSet(object):
res.append(row) res.append(row)
for idx, sc in enumerate(self.subTotalsColumns): for idx, sc in enumerate(self.subTotalsColumns):
for idx2, f in enumerate(sc): for idx2, f in enumerate(sc):
subTotals[idx][idx2] += f.getValue(row) subTotals[idx][idx2] += f.getValue(row,
ignoreTotals=True)
lastRow = row lastRow = row
if lastRow is not None: if lastRow is not None:
subTotalsRows = [] subTotalsRows = []