Merge lp:~julie-w/unifield-server/US-2060 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4099
Proposed branch: lp:~julie-w/unifield-server/US-2060
Merge into: lp:unifield-server
Diff against target: 43 lines (+4/-4)
2 files modified
bin/addons/vertical_integration/report/hq_report_ocp.py (+3/-3)
bin/addons/vertical_integration/report/hq_report_ocp_matching.py (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-2060
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+312443@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 'bin/addons/vertical_integration/report/hq_report_ocp.py'
2--- bin/addons/vertical_integration/report/hq_report_ocp.py 2016-11-18 16:44:10 +0000
3+++ bin/addons/vertical_integration/report/hq_report_ocp.py 2016-12-05 08:35:43 +0000
4@@ -171,7 +171,7 @@
5 mi_obj = pool.get('msf.instance')
6 m_obj = pool.get('account.move')
7 ml_obj = pool.get('account.move.line')
8- excluded_journal_types = ['hq'] # journal types that should not be used to take lines
9+ excluded_journal_types = ['hq', 'cur_adj'] # journal types that should not be used to take lines
10 # Fetch data from wizard
11 if not data.get('form', False):
12 raise osv.except_osv(_('Error'), _('No data retrieved. Check that the wizard is filled in.'))
13@@ -220,7 +220,7 @@
14 # - key: name of the SQL request
15 # - value: the SQL request to use
16 sqlrequests = {
17- # Pay attention to take analytic lines that are not on HQ and MIGRATION journals.
18+ # Pay attention to take analytic lines that are not on HQ, MIGRATION and FXA journals.
19 'rawdata': """
20 SELECT al.id, SUBSTR(i.code, 1, 3),
21 CASE WHEN j.code = 'OD' THEN j.code ELSE aj.code END AS journal,
22@@ -265,7 +265,7 @@
23 AND j.type not in %s
24 AND al.instance_id in %s;
25 """,
26- # Exclude lines that come from a HQ or MIGRATION journal
27+ # Exclude lines that come from a HQ, MIGRATION or FXA journal
28 # Take all lines that are on account that is "shrink_entries_for_hq" which will make a consolidation of them (with a second SQL request)
29 # The subrequest enables to disallow lines that have analytic lines. This is to not retrieve expense/income accounts
30 'bs_entries_consolidated': """
31
32=== modified file 'bin/addons/vertical_integration/report/hq_report_ocp_matching.py'
33--- bin/addons/vertical_integration/report/hq_report_ocp_matching.py 2016-11-18 16:44:10 +0000
34+++ bin/addons/vertical_integration/report/hq_report_ocp_matching.py 2016-12-05 08:35:43 +0000
35@@ -125,7 +125,7 @@
36 pool = pooler.get_pool(cr.dbname)
37 instance_obj = pool.get('msf.instance')
38 period_obj = pool.get('account.period')
39- excluded_journal_types = ['hq']
40+ excluded_journal_types = ['hq', 'cur_adj']
41 # Fetch data from wizard
42 if not data.get('form', False):
43 raise osv.except_osv(_('Error'), _('No data retrieved. Check that the wizard is filled in.'))

Subscribers

People subscribed via source and target branches