Merge lp:~mallorymarcot/unifield-server/us-4658 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4952
Proposed branch: lp:~mallorymarcot/unifield-server/us-4658
Merge into: lp:unifield-server
Diff against target: 15 lines (+4/-1)
1 file modified
bin/addons/purchase/purchase_order_line.py (+4/-1)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-4658
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+347607@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/purchase/purchase_order_line.py'
2--- bin/addons/purchase/purchase_order_line.py 2018-05-24 14:46:30 +0000
3+++ bin/addons/purchase/purchase_order_line.py 2018-06-08 09:17:38 +0000
4@@ -1334,7 +1334,10 @@
5
6 # udpate linked FO lines if has:
7 self.write(cr, uid, [new_po_line], {'origin': pol.origin}, context=context) # otherwise not able to link with FO
8- self.update_fo_lines(cr, uid, [pol.id], context=context)
9+ pol_to_update = [pol.id]
10+ if pol.linked_sol_id and not pol.linked_sol_id.order_id.procurement_request:
11+ pol_to_update += [new_po_line]
12+ self.update_fo_lines(cr, uid, pol_to_update, context=context)
13
14 # cancel the new split PO line:
15 signal = 'cancel_r' if resource else 'cancel'

Subscribers

People subscribed via source and target branches