Merge lp:~unifield-team/unifield-wm/us-837 into lp:unifield-wm

Proposed by jftempo
Status: Merged
Merged at revision: 2714
Proposed branch: lp:~unifield-team/unifield-wm/us-837
Merge into: lp:unifield-wm
Diff against target: 16 lines (+3/-1)
1 file modified
sourcing/sale_order_line.py (+3/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-837
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+283065@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 'sourcing/sale_order_line.py'
2--- sourcing/sale_order_line.py 2015-11-23 16:52:52 +0000
3+++ sourcing/sale_order_line.py 2016-01-19 10:38:09 +0000
4@@ -1140,9 +1140,11 @@
5
6 order_to_check = {}
7 for line in self.read(cr, uid, ids, ['order_id', 'estimated_delivery_date', 'price_unit', 'product_uom_qty'], context=context):
8- order_data = order_obj.read(cr, uid, line['order_id'][0], ['procurement_request', 'order_type'], context=context)
9+ order_data = order_obj.read(cr, uid, line['order_id'][0], ['procurement_request', 'order_type', 'state'], context=context)
10 order_proc = order_data['procurement_request']
11 order_type = order_data['order_type']
12+ if order_data['state'] != 'validated':
13+ continue
14 state_to_use = order_proc and 'confirmed' or 'sourced'
15 self.write(cr, uid, [line['id']], {
16 'state': state_to_use,

Subscribers

People subscribed via source and target branches