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

2013-12-20 10:10:52 +01:00 · 2013-12-20 10:10:52 +01:00 · e07bcefe0c
commit e07bcefe0c
parent dde80ae7d7 11498e14e7
2 changed files with 17 additions and 16 deletions
--- a/composer/report/result.py
+++ b/composer/report/result.py
@ -177,7 +177,8 @@ class ResultSet(object):
                res.append(row)
                for idx, sc in enumerate(self.subTotalsColumns):
                    for idx2, f in enumerate(sc):
-                        subTotals[idx][idx2] += f.getValue(row)
+                        subTotals[idx][idx2] += f.getValue(row,
+                                                           ignoreTotals=True)
                lastRow = row
            if lastRow is not None:
                subTotalsRows = []