unifield-wm

Merge lp:~unifield-team/unifield-wm/us-137 into lp:unifield-wm

  1. us-137
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2408
Proposed branch: lp:~unifield-team/unifield-wm/us-137
Merge into: lp:unifield-wm
Diff against target: 12 lines (+1/-1)
1 file modified
vertical_integration/report/hq_report_ocg.py (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-137
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+252700@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 'vertical_integration/report/hq_report_ocg.py'
2--- vertical_integration/report/hq_report_ocg.py 2015-01-09 10:52:04 +0000
3+++ vertical_integration/report/hq_report_ocg.py 2015-03-12 09:33:52 +0000
4@@ -180,7 +180,7 @@
5 first_result_lines.append(formatted_data)
6
7 # For second report: add to corresponding sub
8- if journal.type in ['correction', 'intermission'] or not account.shrink_entries_for_hq:
9+ if not account.shrink_entries_for_hq:
10 if (journal.code, journal.id, currency.id) not in main_lines:
11 main_lines[(journal.code, journal.id, currency.id)] = []
12 main_lines[(journal.code, journal.id, currency.id)].append(formatted_data[:9] + [formatted_data[10]] + [department_info] + formatted_data[11:12] + formatted_data[13:17])

Subscribers

People subscribed via source and target branches