unifield-wm

Merge lp:~unifield-team/unifield-wm/UTP-948 into lp:unifield-wm

  1. UTP-948
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 1830
Proposed branch: lp:~unifield-team/unifield-wm/UTP-948
Merge into: lp:unifield-wm
Diff against target: 30 lines (+9/-2)
1 file modified
vertical_integration/report/hq_report_ocg.py (+9/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/UTP-948
Reviewer Review Type Date Requested Status
UniField Dev Team Pending
Review via email: mp+193566@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 2013-10-03 14:43:10 +0000
3+++ vertical_integration/report/hq_report_ocg.py 2013-11-01 10:03:28 +0000
4@@ -128,7 +128,8 @@
5 'Third Parties',
6 'Booking Debit',
7 'Booking Credit',
8- 'Booking Currency']
9+ 'Booking Currency',
10+ 'Field Activity']
11
12 # Initialize lists: one for the first report...
13 first_result_lines = []
14@@ -226,9 +227,15 @@
15 analytic_line.functional_currency_id and analytic_line.functional_currency_id.name or ""]
16 first_result_lines.append(formatted_data)
17
18+ cost_center = formatted_data[11][:5] or " "
19+ field_activity = formatted_data[11][6:] or " "
20+
21 if (journal.code, journal.id, currency.id) not in main_lines:
22 main_lines[(journal.code, journal.id, currency.id)] = []
23- 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])
24+ #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])
25+ main_lines[(journal.code, journal.id, currency.id)].append(formatted_data[:9] + [formatted_data[10]] + [department_info] + [cost_center] + formatted_data[13:17] + [field_activity])
26+
27+
28
29 first_result_lines = sorted(first_result_lines, key=lambda line: line[2])
30 first_report = [first_header] + first_result_lines

Subscribers

People subscribed via source and target branches