Unifield Server

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

  1. us-711
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3626
Proposed branch: lp:~unifield-team/unifield-server/us-711
Merge into: lp:unifield-server
Diff against target: 15 lines (+4/-1)
1 file modified
bin/addons/analytic_distribution/analytic_line.py (+4/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-711
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+288792@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/analytic_distribution/analytic_line.py'
2--- bin/addons/analytic_distribution/analytic_line.py 2016-02-12 15:48:05 +0000
3+++ bin/addons/analytic_distribution/analytic_line.py 2016-03-11 15:31:55 +0000
4@@ -358,7 +358,10 @@
5 if account_type == 'FUNDING':
6 aline_cmp_date = aline.document_date
7 # Add line to expired_date if date is not in date_start - date_stop
8- if (date_start and aline_cmp_date < date_start) or (date_stop and aline_cmp_date > date_stop):
9+ # since US-711 date_stop is to be excluded itself as a frontier
10+ # => >= date_stop vs > date_stop
11+ # => http://jira.unifield.org/browse/US-711?focusedCommentId=45744&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-45744
12+ if (date_start and aline_cmp_date < date_start) or (date_stop and aline_cmp_date >= date_stop):
13 expired_date_ids.append(aline.id)
14 # Process regarding account_type
15 if account_type == 'OC':

Subscribers

People subscribed via source and target branches

to all changes: