Unifield Server

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

  1. US-4558
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4885
Proposed branch: lp:~julie-w/unifield-server/US-4558
Merge into: lp:unifield-server
Diff against target: 25 lines (+2/-2)
2 files modified
bin/addons/vertical_integration/report/hq_report_ocb.py (+1/-1)
bin/addons/vertical_integration/report/hq_report_ocb_matching.py (+1/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-4558
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+345485@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_ocb.py'
2--- bin/addons/vertical_integration/report/hq_report_ocb.py 2018-04-18 09:35:06 +0000
3+++ bin/addons/vertical_integration/report/hq_report_ocb.py 2018-05-14 07:59:06 +0000
4@@ -321,7 +321,7 @@
5 context = {}
6 # Prepare some values
7 pool = pooler.get_pool(cr.dbname)
8- excluded_journal_types = ['hq'] # journal types that should not be used to take lines
9+ excluded_journal_types = ['hq', 'migration'] # 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
14=== modified file 'bin/addons/vertical_integration/report/hq_report_ocb_matching.py'
15--- bin/addons/vertical_integration/report/hq_report_ocb_matching.py 2017-04-19 13:01:56 +0000
16+++ bin/addons/vertical_integration/report/hq_report_ocb_matching.py 2018-05-14 07:59:06 +0000
17@@ -71,7 +71,7 @@
18 if context is None:
19 context = {}
20 # Prepare some values
21- excluded_journal_types = ['hq']
22+ excluded_journal_types = ['hq', 'migration']
23 # Fetch data from wizard
24 if not data.get('form', False):
25 raise osv.except_osv(_('Error'), _('No data retrieved. Check that the wizard is filled in.'))

Subscribers

People subscribed via source and target branches