Merge lp:~dorian-kemps/unifield-web/US-6728 into lp:unifield-web

Proposed by jftempo
Status: Merged
Merged at revision: 4982
Proposed branch: lp:~dorian-kemps/unifield-web/US-6728
Merge into: lp:unifield-web
Diff against target: 16 lines (+3/-2)
1 file modified
addons/openerp/widgets/listgroup.py (+3/-2)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-web/US-6728
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+378113@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/widgets/listgroup.py'
2--- addons/openerp/widgets/listgroup.py 2019-04-30 14:13:35 +0000
3+++ addons/openerp/widgets/listgroup.py 2020-01-27 10:41:53 +0000
4@@ -96,9 +96,10 @@
5 if isinstance(computation, basestring):
6 computation = eval(computation)
7
8- if grp_records and total_fields and group_by:
9+ if total_fields and group_by:
10 for sum_key, sum_val in total_fields.items():
11- if grp_records[0].has_key(sum_key):
12+ total_fields[sum_key][1] = 0
13+ if grp_records and grp_records[0].has_key(sum_key):
14 uom_id = set()
15 if rounding_values and fields.get(sum_key, {}).get('related_uom'):
16 uom_id = set([x.get(fields[sum_key]['related_uom']) for x in grp_records])

Subscribers

People subscribed via source and target branches