Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-5925 into lp:unifield-server

  1. US-5925
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5343
Proposed branch: lp:~dorian-kemps/unifield-server/US-5925
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/consumption_calculation/consumption_calculation.py (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-5925
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+366462@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/consumption_calculation/consumption_calculation.py'
2--- bin/addons/consumption_calculation/consumption_calculation.py 2019-02-07 08:29:30 +0000
3+++ bin/addons/consumption_calculation/consumption_calculation.py 2019-04-24 15:17:33 +0000
4@@ -1855,7 +1855,7 @@
5 # Search all real consumption line included in the period
6 # If no period found, take all stock moves
7 if from_date and to_date:
8- rcr_domain = ['&', '&', ('rac_id.state', '!=', 'cancel'), ('product_id', 'in', ids),
9+ rcr_domain = ['&', '&', ('rac_id.state', 'not in', ['draft', 'cancel']), ('product_id', 'in', ids),
10 # All lines with a report started out the period and finished in the period
11 '|', '&', ('rac_id.period_to', '>=', from_date), ('rac_id.period_to', '<=', to_date),
12 # All lines with a report started in the period and finished out the period

Subscribers

People subscribed via source and target branches