pedro
/
django-orchestra-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix on group_by dict based reimplemenattion

This commit is contained in:
Marc 2014-09-16 14:42:32 +00:00
parent 5fa54adf24
commit 22f47d4fcd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orchestra/apps/orders/models.py
View File

@ -313,7 +313,7 @@ class OrderQuerySet(models.QuerySet):
commit = options.get('commit', True) commit = options.get('commit', True)
for account, services in qs.group_by('account', 'service').iteritems(): for account, services in qs.group_by('account', 'service').iteritems():
bill_lines = [] bill_lines = []
for service, orders in services: for service, orders in services.iteritems():
lines = service.handler.generate_bill_lines(orders, account, **options) lines = service.handler.generate_bill_lines(orders, account, **options)
bill_lines.extend(lines) bill_lines.extend(lines)
if commit: if commit:

1
orchestra/models/queryset.py
View File

@ -21,6 +21,7 @@ def group_by(qset, *fields):
group = group[current] group = group[current]
except KeyError: except KeyError:
group[current] = OrderedDict() group[current] = OrderedDict()
group = group[current]
else: else:
try: try:
group[current].append(obj) group[current].append(obj)