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

Proposed by jftempo
Status: Merged
Merged at revision: 4655
Proposed branch: lp:~mallorymarcot/unifield-server/us-3841
Merge into: lp:unifield-server
Diff against target: 25 lines (+2/-2)
2 files modified
bin/addons/purchase/purchase_order_line.py (+1/-1)
bin/addons/sale/sale_order.py (+1/-1)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-3841
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+335166@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 2017-11-26 18:37:44 +0000
3+++ bin/addons/purchase/purchase_order_line.py 2017-12-13 16:51:32 +0000
4@@ -1331,7 +1331,7 @@
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, new_po_line], context=context)
9+ self.update_fo_lines(cr, uid, [pol.id], context=context)
10
11 # cancel the new split PO line:
12 signal = 'cancel_r' if resource else 'cancel'
13
14=== modified file 'bin/addons/sale/sale_order.py'
15--- bin/addons/sale/sale_order.py 2017-12-04 10:46:08 +0000
16+++ bin/addons/sale/sale_order.py 2017-12-13 16:51:32 +0000
17@@ -2462,7 +2462,7 @@
18 self.write(cr, uid, [line.original_line_id.id], {'cancel_split_ok': cancel_split_qty}, context=context)
19 else:
20 # Update the line and the procurement
21- self.cancel_partial_qty(cr, uid, [line.id], qty_diff, resource=False, context=context)
22+ self.cancel_partial_qty(cr, uid, [line.id], qty_diff, resource, context=context)
23
24 so_to_cancel_id = False
25 if context.get('cancel_type', False) != 'update_out' and so_obj._get_ready_to_cancel(cr, uid, order, context=context)[order]:

Subscribers

People subscribed via source and target branches