unifield-wm

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

  1. us-817
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2705
Proposed branch: lp:~unifield-team/unifield-wm/us-817
Merge into: lp:unifield-wm
Diff against target: 89 lines (+15/-7)
3 files modified
vertical_integration/report/hq_report_oca.py (+7/-2)
vertical_integration/report/hq_report_ocb.py (+2/-3)
vertical_integration/report/hq_report_ocg.py (+6/-2)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-817
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+283054@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_oca.py'
2--- vertical_integration/report/hq_report_oca.py 2015-12-04 14:08:26 +0000
3+++ vertical_integration/report/hq_report_oca.py 2016-01-19 09:56:39 +0000
4@@ -312,7 +312,9 @@
5 account_lines_functional_debit_no_ccy_adj[(account.code, currency.name, period_name)] += funct_balance
6
7 # UFTP-375: Do not include FREE1 and FREE2 analytic lines
8- analytic_line_ids = pool.get('account.analytic.line').search(cr, uid, [('period_id', '=', data['form']['period_id']),
9+ # US-817: search period from JI (VI from HQ so AJI always with its JI)
10+ # (AJI period_id is a field function always deduced from date since UTP-943)
11+ analytic_line_ids = pool.get('account.analytic.line').search(cr, uid, [('move_id.period_id', '=', data['form']['period_id']),
12 ('instance_id', 'in', data['form']['instance_ids']),
13 ('journal_id.type', 'not in', ['hq', 'engagement', 'migration']),
14 ('account_id.category', 'not in', ['FREE1', 'FREE2']),
15@@ -346,6 +348,9 @@
16 and analytic_line.journal_id.type == 'cur_adj' or False
17 is_analytic_rev_entry = analytic_line.journal_id \
18 and analytic_line.journal_id.type == 'revaluation' or False
19+ # US-817: display period from JI (VI from HQ so AJI always with its JI)
20+ # (AJI period_id is a field function always deduced from date since UTP-943)
21+ aji_period_id = analytic_line.move_id and analytic_line.move_id.period_id or analytic_line.period_id
22
23 # For first report: as is
24 formatted_data = [analytic_line.instance_id and analytic_line.instance_id.code or "",
25@@ -355,7 +360,7 @@
26 analytic_line.ref or "",
27 datetime.datetime.strptime(analytic_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
28 datetime.datetime.strptime(analytic_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
29- analytic_line.period_id and analytic_line.period_id.code or "",
30+ aji_period_id and aji_period_id.code or "",
31 account and account.code + " " + account.name or "",
32 analytic_line.destination_id and analytic_line.destination_id.code or "",
33 analytic_line.cost_center_id and analytic_line.cost_center_id.code or "",
34
35=== modified file 'vertical_integration/report/hq_report_ocb.py'
36--- vertical_integration/report/hq_report_ocb.py 2015-09-16 09:06:43 +0000
37+++ vertical_integration/report/hq_report_ocb.py 2016-01-19 09:56:39 +0000
38@@ -435,8 +435,7 @@
39 and am.state = 'posted')
40 AND al.instance_id = i.id
41 AND aml.journal_id = aj.id
42- AND al.date >= %s
43- AND al.date <= %s
44+ AND aml.period_id = %s
45 AND j.type not in %s
46 AND al.exported in %s
47 AND al.instance_id in %s;
48@@ -564,7 +563,7 @@
49 'key': 'rawdata',
50 'function': 'postprocess_add_db_id', # to take analytic line IDS and make a DB ID with
51 'fnct_params': 'account.analytic.line',
52- 'query_params': (first_day_of_period, last_day_of_period, tuple(excluded_journal_types), tuple(to_export), tuple(instance_ids)),
53+ 'query_params': (period_id, tuple(excluded_journal_types), tuple(to_export), tuple(instance_ids)),
54 'delete_columns': [0],
55 'id': 0,
56 'object': 'account.analytic.line',
57
58=== modified file 'vertical_integration/report/hq_report_ocg.py'
59--- vertical_integration/report/hq_report_ocg.py 2015-05-06 10:22:47 +0000
60+++ vertical_integration/report/hq_report_ocg.py 2016-01-19 09:56:39 +0000
61@@ -198,7 +198,7 @@
62 if journal.analytic_journal_id and journal.analytic_journal_id.id not in ana_cur_journal_ids:
63 ana_cur_journal_ids.append(journal.analytic_journal_id.id)
64
65- analytic_line_ids = pool.get('account.analytic.line').search(cr, uid, [('period_id', '=', data['form']['period_id']),
66+ analytic_line_ids = pool.get('account.analytic.line').search(cr, uid, [('move_id.period_id', '=', data['form']['period_id']),
67 ('instance_id', 'in', data['form']['instance_ids']),
68 ('journal_id.type', 'not in', ['migration', 'hq', 'engagement', 'inkind']),
69 ('journal_id', 'not in', ana_cur_journal_ids)], context=context)
70@@ -210,6 +210,10 @@
71 account = analytic_line.general_account_id
72 currency = analytic_line.currency_id
73 cost_center_code = analytic_line.cost_center_id and analytic_line.cost_center_id.code or ""
74+
75+ # US-817
76+ aji_period_id = analytic_line.move_id and analytic_line.move_id.period_id or analytic_line.period_id
77+
78 # For first report: as is
79 formatted_data = [analytic_line.instance_id and analytic_line.instance_id.code or "",
80 analytic_line.journal_id and analytic_line.journal_id.code or "",
81@@ -218,7 +222,7 @@
82 analytic_line.ref or "",
83 datetime.datetime.strptime(analytic_line.document_date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
84 datetime.datetime.strptime(analytic_line.date, '%Y-%m-%d').date().strftime('%d/%m/%Y'),
85- analytic_line.period_id and analytic_line.period_id.code or "",
86+ aji_period_id and aji_period_id.code or "",
87 self.translate_account(cr, uid, pool, account),
88 #account and account.code,
89 account and account.code + " " + account.name or "",

Subscribers

People subscribed via source and target branches