Unifield Server

Merge lp:~unifield-team/unifield-server/us-1264 into lp:unifield-server

  1. us-1264
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merge reported by: jftempo
Merged at revision: not available
Proposed branch: lp:~unifield-team/unifield-server/us-1264
Merge into: lp:unifield-server
Diff against target: 11 lines (+0/-1)
1 file modified
bin/addons/vertical_integration/report/hq_report_ocb_matching.py (+0/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1264
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+293404@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_matching.py'
2--- bin/addons/vertical_integration/report/hq_report_ocb_matching.py 2016-02-19 10:13:55 +0000
3+++ bin/addons/vertical_integration/report/hq_report_ocb_matching.py 2016-04-29 13:54:17 +0000
4@@ -96,7 +96,6 @@
5 AND aml.journal_id = j.id
6 AND p.id = aml.period_id
7 AND a.reconcile = 't'
8- AND a.type != 'liquidity'
9 AND j.type not in %s
10 AND p.number not in (0, 16)
11 AND aml.instance_id in %s;

Subscribers

People subscribed via source and target branches

to all changes: